Merge lp://qastaging/~james-page/charms/trusty/keystone/worker-config into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | 86 |
Proposed branch: | lp://qastaging/~james-page/charms/trusty/keystone/worker-config |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
68 lines (+30/-1) 4 files modified
config.yaml (+7/-0) hooks/charmhelpers/contrib/openstack/context.py (+19/-0) hooks/keystone_utils.py (+2/-1) templates/icehouse/keystone.conf (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/keystone/worker-config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
Approve