Merge lp://qastaging/~ahasenack/charms/precise/glance/use-charm-dir into lp://qastaging/~openstack-charmers/charms/precise/glance/ha-support
Proposed by
Andreas Hasenack
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 51 | ||||
| Proposed branch: | lp://qastaging/~ahasenack/charms/precise/glance/use-charm-dir | ||||
| Merge into: | lp://qastaging/~openstack-charmers/charms/precise/glance/ha-support | ||||
| Diff against target: |
71 lines (+11/-10) 4 files modified
hooks/glance-common (+4/-3) hooks/glance-relations (+4/-4) hooks/lib/openstack-common (+2/-2) revision (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~ahasenack/charms/precise/glance/use-charm-dir | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch makes it possible to deploy glance using both juju-core and juju by using the CHARM_DIR environment variable instead of relying on a hardcoded path. This path changed between juju and juju-core, hence the bug.
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
