merge from trunk

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:

nova/tests/test_misc.py

@@ -68,7 +68,7 @@ class ProjectTestCase(test.TestCase):
                 contributors.add(str_dict_replace(email, mailmap))
 
         else:
-            self.assertTrue(False, 'Cannot read commit history')
+            return
 
         for contributor in contributors:
             if contributor == 'nova-core':