Comment 4 for bug 1466077

Reviewed: https://review.fuel-infra.org/10563
Submitter: mos-infra-ci <>
Branch: openstack-ci/fuel-7.0/2015.1.0

Commit: ccf158fc42951206e3360d9bfa6a5ef9f6fdb934
Author: Roman Podoliaka <email address hidden>
Date: Wed Aug 19 12:29:56 2015

Merge remote-tracking branch 'origin/stable/kilo' into merge_stable_kilo

Conflicts:
 nova/compute/manager.py
 nova/tests/unit/compute/test_compute.py
 nova/tests/unit/compute/test_compute_mgr.py
 requirements.txt

Closes-Bug: #1466077

Change-Id: I5d7fbbf07d0470897df3c7332c53c50ac3ca7418