diff options
| author | matt.dietz@rackspace.com <> | 2011-07-20 12:39:37 -0500 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-07-20 12:39:37 -0500 |
| commit | 9fc4cfaafceb3b96c51bc49aec020f89068544a0 (patch) | |
| tree | acada6b104914799a8af1c02b3dd02364cb3599a /nova/compute | |
| parent | 52b68769d50118d8123ed0ee52d258c5285a7f1e (diff) | |
Stupid merge and fixed broken test
Diffstat (limited to 'nova/compute')
| -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 85a60e413..bfc7694e7 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -708,7 +708,7 @@ class ComputeManager(manager.SchedulerDependentManager): @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) @checks_instance_lock - def finish_revert_resize(self, context, migration_id): + def finish_revert_resize(self, context, instance_id, migration_id): """Finishes the second half of reverting a resize. Power back on the source instance and revert the resized attributes |