diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 11:16:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 11:16:29 +0000 |
| commit | fa4b9dbff363d9558f0fcd87d8daab79f0bc63c0 (patch) | |
| tree | 56edc171406d31492c365009ddf2d8a4f5e753a4 | |
| parent | a9276756010a6e64804caaffab556fb566fbc50b (diff) | |
| parent | dea6116723f22632c2e478e00bb0aafcd2febdc9 (diff) | |
| download | nova-fa4b9dbff363d9558f0fcd87d8daab79f0bc63c0.tar.gz | |
Merge "Fixed order of arguments during execution live_migrate()" into stable/kilo
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0e3e670492..43ded976e8 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -6656,9 +6656,9 @@ class _ComputeV4Proxy(object): def inject_network_info(self, ctxt, instance): return self.manager.inject_network_info(ctxt, instance) - def live_migration(self, ctxt, instance, dest, block_migration, + def live_migration(self, ctxt, dest, instance, block_migration, migrate_data=None): - return self.manager.live_migration(ctxt, instance, dest, + return self.manager.live_migration(ctxt, dest, instance, block_migration, migrate_data=migrate_data) |