Merge lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
Edward Hope-Morley
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 144 | ||||
Proposed branch: | lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next | ||||
Diff against target: |
145 lines (+53/-13) 5 files modified
hooks/charmhelpers/contrib/openstack/context.py (+28/-9) hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0) hooks/nova_cc_utils.py (+9/-3) templates/icehouse/neutron.conf (+1/-1) templates/kilo/nova.conf (+1/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+250371@code.qastaging.launchpad.net |
To post a comment you must log in.
charm_lint_check #2137 nova-cloud- controller- next for hopem mp250371
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2137/