summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-05-05 10:23:48 -0500
committerJosh Kearney <josh@jk0.org>2011-05-05 10:23:48 -0500
commit310a43e6cccb151a5bcbeca8c30c25f229e6578c (patch)
tree7fd582cec85865d53ec310ae583501ebc6d61cfb /bin
parent63bfb59d7c2978edbeac0816bb234d28253facd6 (diff)
parent114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff)
Merged trunk
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 3dff16f27..2f6af6e2d 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -151,7 +151,7 @@ class VpnCommands(object):
state = 'up'
print address,
print vpn['host'],
- print vpn['ec2_id'],
+ print ec2utils.id_to_ec2_id(vpn['id']),
print vpn['state_description'],
print state
else: