summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-03-04 11:19:35 -0600
committerCerberus <matt.dietz@rackspace.com>2011-03-04 11:19:35 -0600
commit1d8914fc752f7182f942cdd40f2ba18baedeed0c (patch)
tree7d3c8897d8b14918fc35c990bfeb19ada08cd926 /nova/compute
parent0e1a458166ad1e89ca0755d88b8efec39855ee5c (diff)
downloadnova-1d8914fc752f7182f942cdd40f2ba18baedeed0c.tar.gz
nova-1d8914fc752f7182f942cdd40f2ba18baedeed0c.tar.xz
nova-1d8914fc752f7182f942cdd40f2ba18baedeed0c.zip
More fixes
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py8
-rw-r--r--nova/compute/manager.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index bfa5c7dba..ce9da727d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -430,8 +430,8 @@ class API(base.Base):
migration_ref = self.db.migration_get_by_instance_and_status(context,
instance_id, 'finished')
if not migration_ref:
- raise exception.NotFound(_("No finished migrations found for \
- instance"))
+ raise exception.NotFound(_("No finished migrations found for "
+ "instance"))
params = {'migration_id': migration_ref['id']}
self._cast_compute_message('revert_resize', context, instance_id,
@@ -444,8 +444,8 @@ class API(base.Base):
migration_ref = self.db.migration_get_by_instance_and_status(context,
instance_id, 'finished')
if not migration_ref:
- raise exception.NotFound(_("No finished migrations found for \
- instance"))
+ raise exception.NotFound(_("No finished migrations found for "
+ "instance"))
instance_ref = self.db.instance_get(context, instance_id)
params = {'migration_id': migration_ref['id']}
self._cast_compute_message('confirm_resize', context, instance_id,
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 1c42b383c..b3e864154 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -414,7 +414,7 @@ class ComputeManager(manager.Manager):
@exception.wrap_exception
@checks_instance_lock
def confirm_resize(self, context, instance_id, migration_id):
- """ Destroys the source instance """
+ """Destroys the source instance"""
context = context.elevated()
instance_ref = self.db.instance_get(context, instance_id)
migration_ref = self.db.migration_get(context, migration_id)