Merge lp://qastaging/~gnuoy/charms/trusty/keystone/lp1506397 into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Liam Young
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 189 | ||||
Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/keystone/lp1506397 | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next | ||||
Diff against target: |
165 lines (+29/-16) 5 files modified
actions/openstack_upgrade.py (+2/-2) hooks/keystone_hooks.py (+10/-3) hooks/keystone_utils.py (+6/-1) unit_tests/test_actions_openstack_upgrade.py (+7/-6) unit_tests/test_keystone_hooks.py (+4/-4) |
||||
To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/keystone/lp1506397 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #12158 keystone-next for gnuoy mp274856
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/12158/