Merge lp:~heut2008/charms/trusty/keystone/ldap-support-stable into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk
Proposed by
Yaguang Tang
Status: | Rejected |
---|---|
Rejected by: | Edward Hope-Morley |
Proposed branch: | lp:~heut2008/charms/trusty/keystone/ldap-support-stable |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/keystone/trunk |
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:~heut2008/charms/trusty/keystone/ldap-support-stable |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email: mp+232896@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 69. By Yaguang Tang
-
Added support for Keystone LDAP identity backend
- 68. By Liam Young
-
[gnuoy,r=tribaal] Resync charmhelpers for apt cache bug fixes
- 67. By Liam Young
-
[gnuoy, r=tribaal] Sync charm-helpers from lp:charm-helpers
- 66. By James Page
-
[mikemc,
r=james- page] Add product-streams service type for stream data.
This has been supersceded by https:/ /code.launchpad .net/~heut2008/ charms/ trusty/ keystone/ ldap-support- stable- hotfix/ +merge/ 233525