Merge lp:~vishvananda/nova/fix-zipfile into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Fixes bug lp:616312 by reversing the order of args in nova-manage when it calls AuthManager.get_credentials.

Fixes bug lp:616312 by reversing the order of args in nova-manage when it calls AuthManager.get_credentials.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Jesse Andrews (anotherjesse)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

There is no resulting diff between lp:~vishvananda/nova/fix-zipfile and lp:nova.

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2010-08-10 17:25:52 +0000
+++ bin/nova-manage	2010-08-13 21:14:39 +0000
@@ -206,7 +206,7 @@
     def zipfile(self, project_id, user_id, filename='nova.zip'):
         """Exports credentials for project to a zip file
         arguments: project_id user_id [filename='nova.zip]"""
-        zip_file = self.manager.get_credentials(project_id, user_id)
+        zip_file = self.manager.get_credentials(user_id, project_id)
         with open(filename, 'w') as f:
             f.write(zip_file)