diff options
| author | William Wolf <will.wolf@rackspace.com> | 2011-05-05 00:17:57 -0400 |
|---|---|---|
| committer | William Wolf <will.wolf@rackspace.com> | 2011-05-05 00:17:57 -0400 |
| commit | b5865949d1b690440a268b0cd941b128d74caba7 (patch) | |
| tree | 7577dfaad40d2258d9a009149bb15d05abefc2fb /bin | |
| parent | 5bd57d70135e599e068a6b66d402ce6c75c250cc (diff) | |
| parent | 114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff) | |
merge from 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: |