diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-04 11:20:28 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-04 11:20:28 -0600 |
| commit | 4e98750e0a39b177d6f6523ebf4071f3cebd1a46 (patch) | |
| tree | 16b25b8b2eb3a8c0de7adcd62851c7f99d86fbb4 /nova/compute | |
| parent | 1d8914fc752f7182f942cdd40f2ba18baedeed0c (diff) | |
| parent | 2280848e8477c33f2a903eb7f821dcbcc90ce307 (diff) | |
| download | nova-4e98750e0a39b177d6f6523ebf4071f3cebd1a46.tar.gz nova-4e98750e0a39b177d6f6523ebf4071f3cebd1a46.tar.xz nova-4e98750e0a39b177d6f6523ebf4071f3cebd1a46.zip | |
Merge from trunk
Diffstat (limited to 'nova/compute')
| -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 ce9da727d..33d25fc4b 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -319,12 +319,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 |