← Back to branch summary

~hopem/charms/trusty/keystone/lp1476325

~hopem/charms/trusty/keystone/lp1476325

Viewing all changes in revision 87.3.9.

Committer: Liam Young
Date: 2015-01-09 15:54:17 UTC
mfrom: (99 keystone-242900)
mto: This revision was merged to the branch mainline in revision 100.
Revision ID: liam.young@canonical.com-20150109155417-ev9c5l3hcx7lo4ec

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:
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/__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/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/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/__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/keystone_context.py

hooks/keystone_hooks.py

hooks/keystone_utils.py

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 »