Merge lp://staging/~hopem/charms/trusty/cinder/pki-token-support into lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next
Proposed by
Edward Hope-Morley
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 77 | ||||
Proposed branch: | lp://staging/~hopem/charms/trusty/cinder/pki-token-support | ||||
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next | ||||
Diff against target: |
123 lines (+48/-11) 5 files modified
hooks/charmhelpers/contrib/openstack/context.py (+28/-9) hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0) hooks/cinder_hooks.py (+1/-0) hooks/cinder_utils.py (+3/-1) templates/icehouse/cinder.conf (+2/-1) |
||||
To merge this branch: | bzr merge lp://staging/~hopem/charms/trusty/cinder/pki-token-support | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+250170@code.staging.launchpad.net |
To post a comment you must log in.
charm_lint_check #2134 cinder-next for hopem mp250170
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2134/