Merge lp://qastaging/~james-page/charms/precise/rabbitmq-server/ha-support into lp://qastaging/charms/rabbitmq-server
Proposed by
James Page
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~james-page/charms/precise/rabbitmq-server/ha-support |
| Merge into: | lp://qastaging/charms/rabbitmq-server |
| Diff against target: |
1357 lines (+1124/-127) (has conflicts) 12 files modified
.project (+17/-0) .pydevproject (+8/-0) config.yaml (+40/-0) hooks/config-changed (+0/-70) hooks/lib/ceph_utils.py (+256/-0) hooks/lib/cluster_utils.py (+130/-0) hooks/lib/utils.py (+283/-0) hooks/rabbit_utils.py (+125/-0) hooks/rabbitmq-common (+0/-56) hooks/rabbitmq_server_relations.py (+251/-0) metadata.yaml (+10/-1) revision (+4/-0) Text conflict in config.yaml Contents conflict in hooks/rabbitmq-relations Conflict adding file hooks/upgrade-charm. Moved existing file to hooks/upgrade-charm.moved. Text conflict in metadata.yaml Text conflict in revision |
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/precise/rabbitmq-server/ha-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-03-18.
Description of the change
Refactoring alongside mysql to use openstack charm helpers.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
