← Back to branch summary

~hopem/charms/trusty/ceilometer/lp1518975

~hopem/charms/trusty/ceilometer/lp1518975

Viewing all changes in revision 95.1.10.

Committer: Corey Bryant
Date: 2015-09-22 15:34:48 UTC
mfrom: (97 ceilometer)
mto: This revision was merged to the branch mainline in revision 99.
Revision ID: corey.bryant@canonical.com-20150922153448-b81hzc5hsy2cv3gh

Rebased on trunk

files added:
actions

actions.yaml

actions/actions.py

actions/ceilometer_contexts.py

actions/ceilometer_utils.py

actions/charmhelpers

actions/openstack-upgrade

actions/openstack_upgrade.py

actions/pause

actions/resume

charmhelpers/core/kernel.py

hooks/ceilometer_contexts.py

hooks/ceilometer_utils.py

hooks/charmhelpers

templates/kilo

templates/kilo/ceilometer.conf

files removed:
actions

actions.yaml

actions/openstack-upgrade

actions/openstack_upgrade.py

hooks/charmhelpers/core/kernel.py

files renamed:
hooks/ceilometer_contexts.py => ceilometer_contexts.py

hooks/ceilometer_utils.py => ceilometer_utils.py

hooks/charmhelpers/ => charmhelpers/

files modified:
config.yaml

hooks/ceilometer_hooks.py

tests/basic_deployment.py

unit_tests/test_ceilometer_contexts.py

Show diffs side-by-side

added added

removed removed

actions/actions.py

actions/ceilometer_contexts.py@

actions/ceilometer_utils.py@

actions/charmhelpers@

actions/openstack-upgrade@

actions/openstack-upgrade@

actions/openstack_upgrade.py

actions/openstack_upgrade.py

actions/resume@

ceilometer_contexts.py

ceilometer_utils.py

charmhelpers/core/kernel.py

hooks/ceilometer_contexts.py@

hooks/ceilometer_hooks.py

hooks/ceilometer_utils.py@

hooks/charmhelpers/core/kernel.py

hooks/charmhelpers@

templates/kilo/

templates/kilo/ceilometer.conf

tests/basic_deployment.py

unit_tests/test_ceilometer_contexts.py

Older »