Comment 4 for bug 1471135

Reviewed: https://review.openstack.org/201612
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=274f96b8e51ba04d5c1230c0fa3aa8066b24901e
Submitter: Jenkins
Branch: stable/kilo

commit 274f96b8e51ba04d5c1230c0fa3aa8066b24901e
Author: kairat_kushaev <email address hidden>
Date: Mon Jul 6 11:32:16 2015 +0300

    Support time-delays in server.resize

    Resize operation in nova(that we are for flavor update) is
    asynchronous. So the server may be ACTIVE when we are checking
    server-resize operations(not RESIZE as was excepted).
    We need to wait for a while till the server becomes RESIZE.

    The patch add support of this case to Server resource in heat.
    Closes-bug: #1471135

    Conflicts:
     heat/tests/test_instance.py
     heat/tests/test_server.py
    (cherry-picked from commit f46af8a8e2daa52f6485d65da4ad69db6f0a32bd)

    Change-Id: I19914081996104c5f2144a6de795173f26774c21