Merge lp://qastaging/~heut2008/charms/trusty/keystone/ldap-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Yaguang Tang
Status: | Merged |
---|---|
Approved by: | Edward Hope-Morley |
Approved revision: | 68 |
Merged at revision: | 75 |
Proposed branch: | lp://qastaging/~heut2008/charms/trusty/keystone/ldap-support |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
123 lines (+79/-1) 3 files modified
config.yaml (+32/-0) hooks/keystone_context.py (+13/-0) templates/icehouse/keystone.conf (+34/-1) |
To merge this branch: | bzr merge lp://qastaging/~heut2008/charms/trusty/keystone/ldap-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Edward Hope-Morley | Approve | ||
OpenStack Charmers | Pending | ||
Review via email: mp+230428@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2014-08-12.
To post a comment you must log in.
LGTM