Merge lp://qastaging/~fnordahl/charm-helpers/bug-1636098 into lp://qastaging/charm-helpers
Proposed by
Frode Nordahl
| Status: | Merged |
|---|---|
| Merged at revision: | 661 |
| Proposed branch: | lp://qastaging/~fnordahl/charm-helpers/bug-1636098 |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
140 lines (+10/-7) 7 files modified
charmhelpers/contrib/openstack/context.py (+4/-1) charmhelpers/contrib/openstack/neutron.py (+2/-0) charmhelpers/contrib/openstack/utils.py (+1/-0) tests/contrib/openstack/test_os_contexts.py (+0/-6) tests/core/test_services.py (+1/-0) tests/core/test_unitdata.py (+1/-0) tools/charm_helpers_sync/charm_helpers_sync.py (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~fnordahl/charm-helpers/bug-1636098 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
| Edward Hope-Morley | Pending | ||
|
Review via email:
|
|||
Description of the change
Updated version that fix compability with relation changes in charm-keystone
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM, thanks