Merge lp:~hopem/charms/trusty/nova-cloud-controller/novnc-ssl into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
Edward Hope-Morley
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 151 | ||||
Proposed branch: | lp:~hopem/charms/trusty/nova-cloud-controller/novnc-ssl | ||||
Merge into: | lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next | ||||
Diff against target: |
116 lines (+41/-0) 6 files modified
hooks/nova_cc_context.py (+20/-0) templates/icehouse/nova.conf (+2/-0) templates/juno/nova.conf (+2/-0) templates/kilo/nova.conf (+2/-0) templates/parts/novnc (+9/-0) unit_tests/test_nova_cc_contexts.py (+6/-0) |
||||
To merge this branch: | bzr merge lp:~hopem/charms/trusty/nova-cloud-controller/novnc-ssl | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Billy Olsen | Approve | ||
Review via email: mp+255444@code.launchpad.net |
To post a comment you must log in.
charm_lint_check #3111 nova-cloud- controller- next for hopem mp255444
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/3111/