Merge lp://qastaging/~ivoks/charms/precise/keystone/redux-ivoks-unison into lp://qastaging/~james-page/charms/precise/keystone/redux-ivoks
Proposed by
Ante Karamatić
| Status: | Merged |
|---|---|
| Merged at revision: | 71 |
| Proposed branch: | lp://qastaging/~ivoks/charms/precise/keystone/redux-ivoks-unison |
| Merge into: | lp://qastaging/~james-page/charms/precise/keystone/redux-ivoks |
| Diff against target: |
73 lines (+8/-5) 5 files modified
hooks/charmhelpers/contrib/openstack/context.py (+2/-0) hooks/charmhelpers/contrib/unison/__init__.py (+1/-1) hooks/keystone_hooks.py (+1/-0) revision (+1/-1) templates/haproxy.cfg (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~ivoks/charms/precise/keystone/redux-ivoks-unison |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Pending | ||
|
Review via email:
|
|||
Description of the change
Unison is broken in charm-helpers and this branch. Proposed fix.
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
