← Back to branch summary

~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953

~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953

Viewing all changes in revision 85.3.9.

Committer: Liam Young
Date: 2015-01-09 15:40:23 UTC
mfrom: (96 nova-compute)
mto: This revision was merged to the branch mainline in revision 97.
Revision ID: liam.young@canonical.com-20150109154023-hhw3cusf06h0tnxs

Merged next in and resolve conflicts

files added:
hooks/charmhelpers/__init__.py

hooks/charmhelpers/contrib/network/ufw.py

hooks/charmhelpers/contrib/python

hooks/charmhelpers/contrib/python/__init__.py

hooks/charmhelpers/contrib/python/packages.py

hooks/charmhelpers/core/sysctl.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/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/nova_compute_context.py

hooks/nova_compute_hooks.py

hooks/nova_compute_utils.py

metadata.yaml

revision

templates/havana/nova.conf

templates/juno/nova.conf

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_nova_compute_contexts.py

unit_tests/test_nova_compute_hooks.py

unit_tests/test_nova_compute_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/network/ufw.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/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/sysctl.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/nova_compute_context.py

hooks/nova_compute_hooks.py

hooks/nova_compute_utils.py

templates/havana/nova.conf

templates/juno/nova.conf

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_nova_compute_contexts.py

unit_tests/test_nova_compute_hooks.py

unit_tests/test_nova_compute_utils.py

Older »