← Back to branch summary

~gnuoy/charms/trusty/keystone/next-1385105

~gnuoy/charms/trusty/keystone/next-1385105

Viewing all changes in revision 93.

Committer: Liam Young
Date: 2015-01-14 10:29:20 UTC
mfrom: (87.2.15 keystone)
Revision ID: liam.young@canonical.com-20150114102920-ljv04jae4tc99rch

Merged 'next' in

files added:
files

hooks/charmhelpers/__init__.py

hooks/charmhelpers/contrib/charmsupport

hooks/charmhelpers/contrib/charmsupport/__init__.py

hooks/charmhelpers/contrib/charmsupport/nrpe.py

hooks/charmhelpers/contrib/charmsupport/volumes.py

hooks/charmhelpers/contrib/python

hooks/charmhelpers/contrib/python/__init__.py

hooks/charmhelpers/contrib/python/packages.py

hooks/charmhelpers/core/decorators.py

hooks/nrpe-external-master-relation-changed

hooks/nrpe-external-master-relation-joined

files removed:
hooks/charmhelpers/__init__.py

files modified:
charm-helpers-hooks.yaml

config.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/peerstorage/__init__.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/contrib/unison/__init__.py

hooks/charmhelpers/core/fstab.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.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/keystone_context.py

hooks/keystone_hooks.py

hooks/keystone_utils.py

metadata.yaml

tests/basic_deployment.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_keystone_contexts.py

unit_tests/test_keystone_hooks.py

unit_tests/test_keystone_utils.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/charmsupport/

hooks/charmhelpers/contrib/charmsupport/__init__.py

hooks/charmhelpers/contrib/charmsupport/nrpe.py

hooks/charmhelpers/contrib/charmsupport/volumes.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/peerstorage/__init__.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/contrib/unison/__init__.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/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/keystone_context.py

hooks/keystone_hooks.py

hooks/keystone_utils.py

hooks/nrpe-external-master-relation-changed@

hooks/nrpe-external-master-relation-joined@

tests/basic_deployment.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_keystone_contexts.py

unit_tests/test_keystone_hooks.py

unit_tests/test_keystone_utils.py

Older »