diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-05 07:41:26 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-05 07:41:26 -0700 |
| commit | 51f59b4e86be15d1fac62d3a48ae72e930cf1301 (patch) | |
| tree | 5a6bf71b165403b500b2fef5f27a871067574eeb /bin | |
| parent | 37954e665b874ac2358921d175b30617f456c007 (diff) | |
| parent | 114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff) | |
merge with trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 2 |
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: |