Merge lp://staging/~gandelman-a/charms/precise/glance/https_endpoint into lp://staging/~openstack-charmers/charms/precise/glance/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 44 |
| Proposed branch: | lp://staging/~gandelman-a/charms/precise/glance/https_endpoint |
| Merge into: | lp://staging/~openstack-charmers/charms/precise/glance/ha-support |
| Diff against target: |
598 lines (+341/-50) 5 files modified
config.yaml (+10/-0) hooks/glance-common (+35/-0) hooks/glance-relations (+41/-27) hooks/lib/openstack-common (+254/-22) revision (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/charms/precise/glance/https_endpoint |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
Description of the change
Required glance changes for HTTPS support.
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
Tested OK!