Merge lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Edward Hope-Morley
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 129 | ||||
Proposed branch: | lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next | ||||
Diff against target: |
1010 lines (+382/-126) 8 files modified
hooks/keystone_context.py (+28/-3) hooks/keystone_hooks.py (+66/-21) hooks/keystone_ssl.py (+76/-43) hooks/keystone_utils.py (+98/-31) templates/icehouse/keystone.conf (+9/-3) templates/parts/section-signing (+13/-0) unit_tests/test_keystone_hooks.py (+77/-14) unit_tests/test_keystone_utils.py (+15/-11) |
||||
To merge this branch: | bzr merge lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #2133 keystone-next for hopem mp249881
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2133/