summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-15 13:46:04 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-15 13:46:04 -0700
commite1fb1111d04803b7ffd96b67ab37ae49e83e0d28 (patch)
treeed910e4dbe59a1ee2c1fe7593153dc1af9f0b700 /bin
parente0563f49792441af106c52e662bdada3c7997feb (diff)
parentd36b4d5f3797521b1c2d13a0d30fe98a0671768e (diff)
downloadnova-e1fb1111d04803b7ffd96b67ab37ae49e83e0d28.tar.gz
nova-e1fb1111d04803b7ffd96b67ab37ae49e83e0d28.tar.xz
nova-e1fb1111d04803b7ffd96b67ab37ae49e83e0d28.zip
Merged with trunk to get fix for bug 732866
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 1eb4e5418..2b42dfff5 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -572,7 +572,7 @@ class VmCommands(object):
"""
ctxt = context.get_admin_context()
- instance_id = ec2_id_to_id(ec2_id)
+ instance_id = ec2utils.ec2_id_to_id(ec2_id)
if FLAGS.connection_type != 'libvirt':
msg = _('Only KVM is supported for now. Sorry!')