← Back to branch summary

~le-charmers/charms/trusty/nova-cloud-controller/leadership-election

~le-charmers/charms/trusty/nova-cloud-controller/leadership-election

Viewing all changes in revision 159.

Committer: Liam Young
Date: 2015-05-11 07:38:35 UTC
mfrom: (143.1.19 nova-cloud-controller)
Revision ID: liam.young@canonical.com-20150511073835-gefdguga9xzfpm59

Merged trunk in + LE charmhelper sync

files added:
hooks/charmhelpers/contrib/openstack/templates/git.upstart

hooks/charmhelpers/contrib/openstack/templates/section-zeromq

hooks/zeromq-configuration-relation-changed

hooks/zeromq-configuration-relation-joined

templates/juno

templates/juno/nova.conf

templates/kilo/zeromq

templates/parts/novnc

tests/016-basic-trusty-juno

tests/017-basic-trusty-kilo

tests/018-basic-utopic-juno

tests/019-basic-vivid-kilo

files removed:
hooks/charmhelpers/contrib/openstack/templates/git.upstart

hooks/charmhelpers/contrib/openstack/templates/section-zeromq

tests/11-basic-precise-folsom

tests/12-basic-precise-grizzly

tests/13-basic-precise-havana

files renamed:
tests/10-basic-precise-essex => tests/010-basic-precise-essex

tests/14-basic-precise-icehouse => tests/014-basic-precise-icehouse

tests/15-basic-trusty-icehouse => tests/015-basic-trusty-icehouse

files modified:
Makefile

hooks/charmhelpers/contrib/charmsupport/nrpe.py

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

hooks/charmhelpers/contrib/openstack/context.py

hooks/charmhelpers/contrib/openstack/neutron.py

hooks/charmhelpers/contrib/openstack/utils.py

hooks/charmhelpers/contrib/peerstorage/__init__.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.py

hooks/charmhelpers/core/services/base.py

hooks/charmhelpers/core/strutils.py

hooks/charmhelpers/fetch/__init__.py

hooks/nova_cc_context.py

hooks/nova_cc_hooks.py

hooks/nova_cc_utils.py

metadata.yaml

templates/icehouse/neutron.conf

templates/icehouse/nova.conf

templates/kilo/nova.conf

tests/basic_deployment.py

tests/charmhelpers/contrib/amulet/utils.py

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

unit_tests/test_nova_cc_contexts.py

unit_tests/test_nova_cc_hooks.py

unit_tests/test_nova_cc_utils.py

Show diffs side-by-side

added added

removed removed

hooks/charmhelpers/contrib/charmsupport/nrpe.py

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

hooks/charmhelpers/contrib/openstack/context.py

hooks/charmhelpers/contrib/openstack/neutron.py

hooks/charmhelpers/contrib/openstack/templates/git.upstart

hooks/charmhelpers/contrib/openstack/templates/git.upstart

hooks/charmhelpers/contrib/openstack/templates/section-zeromq

hooks/charmhelpers/contrib/openstack/templates/section-zeromq

hooks/charmhelpers/contrib/openstack/utils.py

hooks/charmhelpers/contrib/peerstorage/__init__.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.py

hooks/charmhelpers/core/services/base.py

hooks/charmhelpers/core/strutils.py

hooks/charmhelpers/fetch/__init__.py

hooks/nova_cc_context.py

hooks/nova_cc_hooks.py

hooks/nova_cc_utils.py

hooks/zeromq-configuration-relation-changed@

hooks/zeromq-configuration-relation-joined@

templates/icehouse/neutron.conf

templates/icehouse/nova.conf

templates/juno/

templates/juno/nova.conf

templates/kilo/nova.conf

templates/kilo/zeromq

templates/parts/novnc

tests/016-basic-trusty-juno

tests/017-basic-trusty-kilo

tests/018-basic-utopic-juno

tests/019-basic-vivid-kilo

tests/11-basic-precise-folsom

tests/12-basic-precise-grizzly

tests/13-basic-precise-havana

tests/basic_deployment.py

tests/charmhelpers/contrib/amulet/utils.py

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

unit_tests/test_nova_cc_contexts.py

unit_tests/test_nova_cc_hooks.py

unit_tests/test_nova_cc_utils.py

Older »