openstack
/
nova
Code Issues Proposed changes

Merge "Incorrect argument order passed to swap_volume" into stable/kilo

This commit is contained in:
Jenkins 2015-05-06 18:12:38 +00:00 committed by Gerrit Code Review
parent dd5f26bd6a 7ae9466fc5
commit 08d0b08ce8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/manager.py
View File

@ -6768,8 +6768,8 @@ class _ComputeV4Proxy(object):
return self.manager.set_host_enabled(ctxt, enabled)
def swap_volume(self, ctxt, instance, old_volume_id, new_volume_id):
return self.manager.swap_volume(ctxt, instance, old_volume_id,
new_volume_id)
return self.manager.swap_volume(ctxt, old_volume_id, new_volume_id,
instance)
def get_host_uptime(self, ctxt):
return self.manager.get_host_uptime(ctxt)