Merge lp://qastaging/~gandelman-a/charms/precise/keystone/db_recreate_services into lp://qastaging/~charmers/charms/precise/keystone/trunk

Proposed by Adam Gandelman
Status: Merged
Approved by: Clint Byrum
Approved revision: 36
Merged at revision: 35
Proposed branch: lp://qastaging/~gandelman-a/charms/precise/keystone/db_recreate_services
Merge into: lp://qastaging/~charmers/charms/precise/keystone/trunk
Diff against target: 126 lines (+43/-23)
3 files modified
hooks/keystone-hooks (+20/-16)
hooks/utils.py (+22/-6)
revision (+1/-1)
To merge this branch: bzr merge lp://qastaging/~gandelman-a/charms/precise/keystone/db_recreate_services
Reviewer Review Type Date Requested Status
Clint Byrum (community) Approve
Review via email: mp+124825@code.qastaging.launchpad.net
To post a comment you must log in.
36. By Adam Gandelman

hooks/utils.py: Avoid another duplicate role assignment in create_role().

Do not add role directly through API in create_role(). Use grant_role()
utility function instead, which checks for duplicate assignments.

Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Adam, this is brilliant. Keep up the good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches