diff options
| author | Rick Harris <rconradharris@gmail.com> | 2011-06-02 14:08:19 -0500 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2011-06-02 14:08:19 -0500 |
| commit | 82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab (patch) | |
| tree | 8440cc717219ed8165fa30604db5ce3e711d3fc9 /bin | |
| parent | 6f22642e792e9c861c23266672f8d939cd9dd060 (diff) | |
| parent | 8b6de21b5ed4248998eef7deb57b1bc4f3863276 (diff) | |
| download | nova-82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab.tar.gz nova-82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab.tar.xz nova-82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab.zip | |
Fixing conflicts
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 26c0d776c..5de4d9e81 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -536,7 +536,7 @@ class FloatingIpCommands(object): for floating_ip in floating_ips: instance = None if floating_ip['fixed_ip']: - instance = floating_ip['fixed_ip']['instance']['ec2_id'] + instance = floating_ip['fixed_ip']['instance']['hostname'] print "%s\t%s\t%s" % (floating_ip['host'], floating_ip['address'], instance) |