Merge lp:~hopem/charms/trusty/glance/pki-token-support into lp:~openstack-charmers-archive/charms/trusty/glance/next
Proposed by
Edward Hope-Morley
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 101 | ||||
Proposed branch: | lp:~hopem/charms/trusty/glance/pki-token-support | ||||
Merge into: | lp:~openstack-charmers-archive/charms/trusty/glance/next | ||||
Diff against target: |
121 lines (+49/-11) 4 files modified
hooks/charmhelpers/contrib/openstack/context.py (+28/-9) hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0) hooks/glance_utils.py (+6/-2) templates/parts/keystone (+1/-0) |
||||
To merge this branch: | bzr merge lp:~hopem/charms/trusty/glance/pki-token-support | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+250368@code.launchpad.net |
To post a comment you must log in.
charm_lint_check #2135 glance-next for hopem mp250368
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2135/