Comment 7 for bug 1521881

Reviewed: https://review.openstack.org/253388
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=1012e890117d2a0c0ecee1b4af4c996808acb2fd
Submitter: Jenkins
Branch: stable/liberty

commit 1012e890117d2a0c0ecee1b4af4c996808acb2fd
Author: huangtianhua <email address hidden>
Date: Wed Dec 2 16:02:41 2015 +0800

    Correct reset_state_on_error() handling

    The change Ic948c2fe5baf23c9c4ced33060f672ca9c278a19 aim
    to prevent the stacks hanging in IN_PROGRESS, but the code
    is incorrect, this patch fix them.

    Closes-Bug: #1521881
    Related-Bug: #1492433
    (cherry picked from commit 63141b20bcb5fe0b7941a6d8578936e42c485242)

    Conflicts:
     heat/tests/test_stack.py
    Change-Id: I0e9655b5a931452d810c38b7ddf6a2ce742bb7ed