Merge lp://staging/~openstack-charmers/charms/precise/cinder/ods_merge into lp://staging/charms/raring/cinder
Proposed by
Adam Gandelman
Status: | Merged |
---|---|
Merged at revision: | 27 |
Proposed branch: | lp://staging/~openstack-charmers/charms/precise/cinder/ods_merge |
Merge into: | lp://staging/charms/raring/cinder |
Diff against target: |
847 lines (+297/-54) 9 files modified
hooks/charmhelpers/contrib/openstack/context.py (+20/-1) hooks/charmhelpers/contrib/openstack/neutron.py (+20/-0) hooks/charmhelpers/contrib/openstack/utils.py (+81/-10) hooks/charmhelpers/contrib/storage/linux/ceph.py (+27/-3) hooks/charmhelpers/core/hookenv.py (+78/-23) hooks/charmhelpers/core/host.py (+15/-9) hooks/charmhelpers/fetch/__init__.py (+53/-5) hooks/charmhelpers/fetch/bzrurl.py (+1/-1) hooks/cinder_contexts.py (+2/-2) |
To merge this branch: | bzr merge lp://staging/~openstack-charmers/charms/precise/cinder/ods_merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Abstain | ||
OpenStack Charmers | Pending | ||
Review via email: mp+194064@code.staging.launchpad.net |
Description of the change
Various fixes for Ceph contexts
To post a comment you must log in.