diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 11:16:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 11:16:49 +0000 |
| commit | bab1bde78b52dca92b1966187735565f356a3674 (patch) | |
| tree | c86cd11ed49ebcdb10baf25861cee5b3a99e97d6 | |
| parent | fa4b9dbff363d9558f0fcd87d8daab79f0bc63c0 (diff) | |
| parent | 33ba90240a2ad3165274d9e54ceb156273404c9a (diff) | |
| download | nova-bab1bde78b52dca92b1966187735565f356a3674.tar.gz | |
Merge "Pass migrate_data to pre_live_migration" into stable/kilo
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 43ded976e8..708d73451b 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -6673,7 +6673,7 @@ class _ComputeV4Proxy(object): def pre_live_migration(self, ctxt, instance, block_migration, disk, migrate_data=None): return self.manager.pre_live_migration(ctxt, instance, block_migration, - disk, migrate_data=None) + disk, migrate_data=migrate_data) def prep_resize(self, ctxt, image, instance, instance_type, reservations=None, request_spec=None, |