← Back to branch summary

~macgreagoir/charms/trusty/nova-cloud-controller/check-nova-services

~macgreagoir/charms/trusty/nova-cloud-controller/check-nova-services

Viewing all changes in revision 150.

Committer: Mick Gregg
Date: 2015-04-10 16:37:16 UTC
mfrom: (145.1.6 next)
Revision ID: mick.gregg@canonical.com-20150410163716-vb0n1zwimbbelvnr

Merge with trunk

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

files modified:
hooks/charmhelpers/contrib/openstack/utils.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

unit_tests/test_nova_cc_contexts.py

unit_tests/test_nova_cc_hooks.py

Show diffs side-by-side

added added

removed removed

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

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

hooks/charmhelpers/contrib/openstack/utils.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

unit_tests/test_nova_cc_contexts.py

unit_tests/test_nova_cc_hooks.py

Older »