Comment 5 for bug 917615

Reviewed: https://review.openstack.org/3232
Committed: http://github.com/openstack/nova/commit/4f43496502aef88752e616695e29f930f09009c3
Submitter: Jenkins
Branch: stable/diablo

commit 4f43496502aef88752e616695e29f930f09009c3
Author: Kiall Mac Innes <email address hidden>
Date: Fri Jan 20 20:26:24 2012 +0000

    Fix bug #917615.

    Partial Cherry-Pick of 52d58ad583350f2448b3971eeb3f1df541cfbfe5.

    Changes to nova.compute.manager.recover_live_migration() discarded as they are unnecessary for diablo.

    Conflicts:

     nova/compute/manager.py

    Change-Id: I773b3f026fd7ebcb2aefcd2ef348cca0c5477238