OpenStack Compute (nova)

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

  1. lp702164
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Jay Pipes
Approved revision: 557
Merged at revision: 559
Proposed branch: lp:~vishvananda/nova/lp702164
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/auth/manager.py (+1/-1)
To merge this branch: bzr merge lp:~vishvananda/nova/lp702164
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Devin Carlen (community) Approve
Review via email: mp+46069@code.launchpad.net

Description of the change

Fixes broken call to __generate_rc in auth manager.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

approve

review: Approve
Revision history for this message
Jay Pipes (jaypipes) wrote :

matching function signatures is always good practice :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/auth/manager.py'
2--- nova/auth/manager.py 2011-01-12 18:16:51 +0000
3+++ nova/auth/manager.py 2011-01-13 01:11:50 +0000
4@@ -721,7 +721,7 @@
5 if project is None:
6 project = user.id
7 pid = Project.safe_id(project)
8- return self.__generate_rc(user.access, user.secret, pid, use_dmz)
9+ return self.__generate_rc(user, pid, use_dmz)
10
11 @staticmethod
12 def __generate_rc(user, pid, use_dmz=True, host=None):