← Back to branch summary

~gnuoy/charms/trusty/cinder/add-nrpe-checks

~gnuoy/charms/trusty/cinder/add-nrpe-checks

Viewing all changes in revision 65.

Committer: Liam Young
Date: 2015-01-09 16:02:39 UTC
mfrom: (56.2.9 cinder.next)
Revision ID: liam.young@canonical.com-20150109160239-qldk423wxfno2ao3

Merged next in and resolved conflicts

files added:
hooks/charmhelpers/__init__.py

hooks/charmhelpers/contrib/python

hooks/charmhelpers/contrib/python/__init__.py

hooks/charmhelpers/contrib/python/packages.py

hooks/charmhelpers/core/decorators.py

hooks/charmhelpers/fetch/giturl.py

files removed:
hooks/charmhelpers/__init__.py

files modified:
README.md

charm-helpers-hooks.yaml

hooks/charmhelpers/contrib/hahelpers/cluster.py

hooks/charmhelpers/contrib/network/ip.py

hooks/charmhelpers/contrib/openstack/amulet/deployment.py

hooks/charmhelpers/contrib/openstack/amulet/utils.py

hooks/charmhelpers/contrib/openstack/context.py

hooks/charmhelpers/contrib/openstack/ip.py

hooks/charmhelpers/contrib/openstack/neutron.py

hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg

hooks/charmhelpers/contrib/openstack/templating.py

hooks/charmhelpers/contrib/openstack/utils.py

hooks/charmhelpers/contrib/storage/linux/ceph.py

hooks/charmhelpers/contrib/storage/linux/loopback.py

hooks/charmhelpers/contrib/storage/linux/lvm.py

hooks/charmhelpers/contrib/storage/linux/utils.py

hooks/charmhelpers/core/fstab.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.py

hooks/charmhelpers/core/services/__init__.py

hooks/charmhelpers/core/services/helpers.py

hooks/charmhelpers/core/templating.py

hooks/charmhelpers/fetch/__init__.py

hooks/charmhelpers/fetch/archiveurl.py

hooks/charmhelpers/fetch/bzrurl.py

hooks/cinder_contexts.py

hooks/cinder_hooks.py

hooks/cinder_utils.py

metadata.yaml

tests/charmhelpers/__init__.py

tests/charmhelpers/contrib/amulet/deployment.py

tests/charmhelpers/contrib/amulet/utils.py

tests/charmhelpers/contrib/openstack/amulet/deployment.py

tests/charmhelpers/contrib/openstack/amulet/utils.py

unit_tests/test_cinder_hooks.py

unit_tests/test_cinder_utils.py

unit_tests/test_cluster_hooks.py

Show diffs side-by-side

added added

removed removed

charm-helpers-hooks.yaml

hooks/charmhelpers/__init__.py

hooks/charmhelpers/__init__.py

hooks/charmhelpers/contrib/hahelpers/cluster.py

hooks/charmhelpers/contrib/network/ip.py

hooks/charmhelpers/contrib/openstack/amulet/deployment.py

hooks/charmhelpers/contrib/openstack/amulet/utils.py

hooks/charmhelpers/contrib/openstack/context.py

hooks/charmhelpers/contrib/openstack/ip.py

hooks/charmhelpers/contrib/openstack/neutron.py

hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg

hooks/charmhelpers/contrib/openstack/templating.py

hooks/charmhelpers/contrib/openstack/utils.py

hooks/charmhelpers/contrib/python/

hooks/charmhelpers/contrib/python/__init__.py

hooks/charmhelpers/contrib/python/packages.py

hooks/charmhelpers/contrib/storage/linux/ceph.py

hooks/charmhelpers/contrib/storage/linux/loopback.py

hooks/charmhelpers/contrib/storage/linux/lvm.py

hooks/charmhelpers/contrib/storage/linux/utils.py

hooks/charmhelpers/core/decorators.py

hooks/charmhelpers/core/fstab.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.py

hooks/charmhelpers/core/services/__init__.py

hooks/charmhelpers/core/services/helpers.py

hooks/charmhelpers/core/templating.py

hooks/charmhelpers/fetch/__init__.py

hooks/charmhelpers/fetch/archiveurl.py

hooks/charmhelpers/fetch/bzrurl.py

hooks/charmhelpers/fetch/giturl.py

hooks/cinder_contexts.py

hooks/cinder_hooks.py

hooks/cinder_utils.py

tests/charmhelpers/__init__.py

tests/charmhelpers/contrib/amulet/deployment.py

tests/charmhelpers/contrib/amulet/utils.py

tests/charmhelpers/contrib/openstack/amulet/deployment.py

tests/charmhelpers/contrib/openstack/amulet/utils.py

unit_tests/test_cinder_hooks.py

unit_tests/test_cinder_utils.py

unit_tests/test_cluster_hooks.py

Older »