Merge lp://qastaging/~ahasenack/charms/precise/rabbitmq-server/rabbitmq-server-juju-core-compat into lp://qastaging/charms/rabbitmq-server
Proposed by
Andreas Hasenack
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Adam Gandelman | ||||
| Approved revision: | 42 | ||||
| Merged at revision: | 42 | ||||
| Proposed branch: | lp://qastaging/~ahasenack/charms/precise/rabbitmq-server/rabbitmq-server-juju-core-compat | ||||
| Merge into: | lp://qastaging/charms/rabbitmq-server | ||||
| Diff against target: |
21 lines (+3/-3) 2 files modified
hooks/lib/openstack_common.py (+2/-2) revision (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~ahasenack/charms/precise/rabbitmq-server/rabbitmq-server-juju-core-compat | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Use CHARM_DIR instead of a hardcoded path for the local charm directory. This makes this charm compatible with both pyjuju and juju-core, where it was broken before.
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
