Merge lp://qastaging/~gnuoy/charms/trusty/keystone/token-expiry into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Liam Young
| Status: | Merged |
|---|---|
| Merged at revision: | 138 |
| Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/keystone/token-expiry |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
| Diff against target: |
55 lines (+8/-5) 4 files modified
config.yaml (+4/-4) hooks/keystone_context.py (+1/-0) templates/icehouse/keystone.conf (+2/-1) templates/kilo/keystone.conf (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/keystone/token-expiry |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
