Merge lp://qastaging/~gandelman-a/charms/precise/keystone/openstack-charmers-merge into lp://qastaging/~openstack-charmers/charms/precise/keystone/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 46 |
| Proposed branch: | lp://qastaging/~gandelman-a/charms/precise/keystone/openstack-charmers-merge |
| Merge into: | lp://qastaging/~openstack-charmers/charms/precise/keystone/ha-support |
| Diff against target: |
347 lines (+97/-110) 5 files modified
config.yaml (+9/-0) hooks/keystone-hooks (+18/-2) hooks/lib/openstack_common.py (+35/-6) hooks/utils.py (+34/-101) revision (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/charms/precise/keystone/openstack-charmers-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This redirects a merge into the upstream charm toward the ~openstack-charmers WIP branches. Most the changes enable better grizzly support, the other changes are mostly openstack_common.py sync and a general rebase against upstream charm.
Original MP @ https:/
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
