Merge lp://staging/~gandelman-a/charms/precise/keystone/avoid_restarts into lp://staging/~openstack-charmers/charms/precise/keystone/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 65 |
| Proposed branch: | lp://staging/~gandelman-a/charms/precise/keystone/avoid_restarts |
| Merge into: | lp://staging/~openstack-charmers/charms/precise/keystone/ha-support |
| Diff against target: |
92 lines (+27/-4) (has conflicts) 3 files modified
hooks/keystone_hooks.py (+9/-4) hooks/keystone_utils.py (+14/-0) revision (+4/-0) Text conflict in revision |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/charms/precise/keystone/avoid_restarts |
| 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
