Merge branch 'master' into apply_api

Conflicts:
	nova/compute/node.py
	nova/volume/storage.py

1 files changed, 2 insertions, 0 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index f418e162b..ffb626b24 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -62,6 +62,8 @@ class VpnCommands(object):
                     net = 'up'
                 else:
                     net = 'down'
+                print vpn['private_dns_name'],
+                print vpn['node_name'],
                 print vpn['instance_id'],
                 print vpn['state_description'],
                 print net