Merge lp://qastaging/~openstack-charmers/charms/precise/glance/ceilometer-support into lp://qastaging/~charmers/charms/precise/glance/trunk
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 41 |
| Proposed branch: | lp://qastaging/~openstack-charmers/charms/precise/glance/ceilometer-support |
| Merge into: | lp://qastaging/~charmers/charms/precise/glance/trunk |
| Diff against target: |
1065 lines (+403/-99) 15 files modified
config.yaml (+8/-10) 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/glance_contexts.py (+1/-10) hooks/glance_relations.py (+15/-1) hooks/glance_utils.py (+1/-0) metadata.yaml (+2/-0) templates/folsom/glance-api.conf (+9/-25) unit_tests/test_glance_relations.py (+72/-1) |
| To merge this branch: | bzr merge lp://qastaging/~openstack-charmers/charms/precise/glance/ceilometer-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Support for use with ceilometer
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
