Merge lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-disable into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Edward Hope-Morley
Status: | Merged |
---|---|
Merged at revision: | 126 |
Proposed branch: | lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-disable |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
315 lines (+84/-71) 5 files modified
hooks/keystone_hooks.py (+30/-55) hooks/keystone_utils.py (+32/-5) tests/basic_deployment.py (+0/-1) unit_tests/test_keystone_hooks.py (+7/-4) unit_tests/test_keystone_utils.py (+15/-6) |
To merge this branch: | bzr merge lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-disable |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+252231@code.qastaging.launchpad.net |
To post a comment you must log in.
charm_lint_check #2542 keystone-next for hopem mp252231
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2542/