Comment 2 for bug 1474550

Reviewed: https://review.openstack.org/201771
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=e06156258eba3b8b77e048828606a117b1b8b9ea
Submitter: Jenkins
Branch: master

commit e06156258eba3b8b77e048828606a117b1b8b9ea
Author: Matt Riedemann <email address hidden>
Date: Tue Jul 14 20:52:57 2015 +0000

    Revert "Implement compare-and-swap for instance update"

    This reverts commit 5b4083f8cbbcca18ea5896f06b371e29b244d0e2

    There are gate failures spiking with InstanceUpdateConflict
    since this merged, the exception isn't being handled like
    how UnexpectedTaskStateError would be handled, so we need
    to think about this some more before landing it.

    Change-Id: I1d2868eac456052a9ce05a7b8c838eff817d89a4
    Closes-Bug: #1474550