diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-04 10:36:54 -0500 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-04 10:36:54 -0500 |
| commit | 5f251e71de902f9218bb7300cccffb0d66158c61 (patch) | |
| tree | 531d7d22a0c35ca256c3a7e3e22d86ccad2fcb7b | |
| parent | abd5779068f3b979fc79dec7a68549999c58092d (diff) | |
| parent | 2280848e8477c33f2a903eb7f821dcbcc90ce307 (diff) | |
| download | nova-5f251e71de902f9218bb7300cccffb0d66158c61.tar.gz nova-5f251e71de902f9218bb7300cccffb0d66158c61.tar.xz nova-5f251e71de902f9218bb7300cccffb0d66158c61.zip | |
merge lp:nova
| -rw-r--r-- | nova/compute/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index e7dcc67b2..0d54ae6cc 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -343,12 +343,12 @@ class API(base.Base): try: instance = self.get(context, instance_id) except exception.NotFound: - LOG.warning(_("Instance %d was not found during terminate"), + LOG.warning(_("Instance %s was not found during terminate"), instance_id) raise if (instance['state_description'] == 'terminating'): - LOG.warning(_("Instance %d is already being terminated"), + LOG.warning(_("Instance %s is already being terminated"), instance_id) return |