summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-28 17:08:06 +0000
committerGerrit Code Review <review@openstack.org>2013-01-28 17:08:06 +0000
commitd6d8cb79eab13df989011cabc39cb977a9a5fba0 (patch)
treef68eb2eead171f6cbb7f7c9954b8b7412c910c88
parent98390d80665e4522c2ec749aee738b087a576702 (diff)
parent765147a9ce429c560a4be1869ac5d33bcc05ec6c (diff)
downloadnova-d6d8cb79eab13df989011cabc39cb977a9a5fba0.tar.gz
nova-d6d8cb79eab13df989011cabc39cb977a9a5fba0.tar.xz
nova-d6d8cb79eab13df989011cabc39cb977a9a5fba0.zip
Merge "Fix a typo of log message in _poll_unconfirmed_resizes"
-rw-r--r--nova/compute/manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 275611cdf..dbfee2469 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -3069,8 +3069,8 @@ class ComputeManager(manager.SchedulerDependentManager):
vm_state = instance['vm_state']
task_state = instance['task_state']
if vm_state != vm_states.RESIZED or task_state is not None:
- reason = _("In states %(vm_state)s/%(task_state)s, not"
- "RESIZED/None")
+ reason = _("In states %(vm_state)s/%(task_state)s, not "
+ "RESIZED/None")
_set_migration_to_error(migration, reason % locals(),
instance=instance)
continue