summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-07-20 10:30:03 -0400
committerDan Prince <dan.prince@rackspace.com>2011-07-20 10:30:03 -0400
commit1ba04869623a0152a487a50e25bfce0ee6a65f53 (patch)
tree27fff01b0bea16bbc5fe8dd575a9a28399f50c9a /nova/api
parent4b4bebad3b44e7b55e55a005a3629aebf50ecfa2 (diff)
Ya! Apparently sleep helps me fix failing tests.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e16221fd8..1e09b6ea0 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -466,7 +466,7 @@ class ControllerV10(Controller):
try:
self.compute_api.rebuild(context, instance_id, image_id)
except exception.BuildInProgress:
- msg = _("Instance %d is currently being rebuilt.") % instance_id
+ msg = _("Instance %s is currently being rebuilt.") % instance_id
LOG.debug(msg)
return faults.Fault(exc.HTTPConflict(explanation=msg))
@@ -590,7 +590,7 @@ class ControllerV11(Controller):
self.compute_api.rebuild(context, instance_id, image_href, name,
metadata, personalities)
except exception.BuildInProgress:
- msg = _("Instance %d is currently being rebuilt.") % instance_id
+ msg = _("Instance %s is currently being rebuilt.") % instance_id
LOG.debug(msg)
return faults.Fault(exc.HTTPConflict(explanation=msg))