Merge lp:~reldan/nova/lp688220 into lp:~hudson-openstack/nova/trunk

[Eldar Nugaev]

Fix 688220
Added dependency on Twisted>=10.1.0 to pip-requires

[Chmouel Boudjnah (chmouel)]

You will have to add yourself to the Authors file if you want this to be merged.

[Eldar Nugaev (reldan)]

> You will have to add yourself to the Authors file if you want this to be
> merged.

Thank you! Fixed.

[Soren Hansen (soren)]

Looks good!

review: Approve

[Anton Panasenko (apanasenko)]

approve

review: Approve

[Soren Hansen (soren)]

Actually, the Authors file has been alphabetical so far. Can you move yourself up between Devin and Eric?

review: Needs Fixing

[Eldar Nugaev (reldan)]

> Actually, the Authors file has been alphabetical so far. Can you move yourself
> up between Devin and Eric?
Thank you, Soren. For your review. I should be more accurate next time.

[Jonathan Bryce (jbryce)]

lgtm now

review: Approve

[Rick Clark (dendrobates)]

trivial. approved.

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~reldan/nova/lp688220 into lp:nova failed. Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_authorize_revoke_security_group_cidr ... [OK]
    test_authorize_revoke_security_group_foreign_group ... [OK]
    test_create_delete_security_group ... [OK]
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
    test_get_all_security_groups ... [OK]
  XmlConversionTestCase
    test_number_conversion ... [OK]
nova.tests.auth_unittest
  AuthManagerDbTestCase
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_add_user_role_doesnt_infect_project_roles ... [OK]
    test_adding_role_to_project_is_ignored_unless_added_to_user ... [OK]
    test_can_add_and_remove_user_role ... [OK]
    test_can_add_remove_user_with_role ... [OK]
    test_can_add_user_to_project ... [OK]
    test_can_create_and_get_project ... [OK]
    test_can_create_and_get_project_with_attributes ... [OK]
    test_can_create_project_with_manager ... [OK]
    test_can_delete_project ... [OK]
    test_can_delete_user ... [OK]
    test_can_generate_x509 ... [OK]
    test_can_list_project_roles ... [OK]
    test_can_list_projects ... [OK]
    test_can_list_user_roles ... [OK]
    test_can_list_users ... [OK]
    test_can_modify_project ... [OK]
    test_can_modify_users ... [OK]
    test_can_remove_project_role_but_keep_user_role ... [OK]
    test_can_remove_user_from_project ... [OK]
    test_can_remove_user_roles ... [OK]
    test_can_retrieve_project_by_user ... [OK]
    test_create_and_find_user ... [OK]
    test_create_and_find_with_properties ... [OK]
    test_create_project_assigns_manager_to_members ...

=== modified file 'Authors'
--- Authors	2010-12-13 19:34:09 +0000
+++ Authors	2010-12-15 17:21:29 +0000
@@ -6,6 +6,7 @@
 Chmouel Boudjnah <[e-mail]>
 Dean Troyer <[e-mail]>
 Devin Carlen <[e-mail]>
+Eldar Nugaev <[e-mail]>
 Eric Day <[e-mail]>
 Ewan Mellor <[e-mail]>
 Hisaki Ohara <[e-mail]>

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2010-12-08 20:20:44 +0000
+++ tools/pip-requires	2010-12-15 17:21:29 +0000
@@ -21,3 +21,4 @@
 greenlet==0.3.1
 nose
 bzr
+Twisted>=10.1.0
\ No newline at end of file