← Back to branch summary

~corey.bryant/charms/trusty/neutron-api/stuff

~corey.bryant/charms/trusty/neutron-api/stuff

Viewing all changes in revision 39.9.67.

Committer: Subbarayudu Mukkamala
Date: 2015-10-27 14:50:30 UTC
mfrom: (153 neutron-api-274709)
mto: This revision was merged to the branch mainline in revision 155.
Revision ID: smukkamala@nuagenetworks.net-20151027145030-3lr5cofupf4tond8

Merge from lp:~openstack-charmers/charms/trusty/.../next/

files added:
actions/openstack-upgrade

actions/openstack_upgrade.py

hooks/etcd-proxy-relation-broken

hooks/etcd-proxy-relation-changed

hooks/etcd-proxy-relation-departed

hooks/etcd-proxy-relation-joined

hooks/install.real

templates/icehouse/etcd.conf

templates/icehouse/plumgrid.ini

templates/liberty

templates/liberty/neutron.conf

templates/liberty/neutron_lbaas.conf

templates/liberty/neutron_vpnaas.conf

tests/020-basic-trusty-liberty

tests/021-basic-wily-liberty

tests/tests.yaml

unit_tests/test_actions_openstack_upgrade.py

files modified:
Makefile

actions.yaml

config.yaml

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/neutron.py

hooks/charmhelpers/contrib/openstack/templates/ceph.conf

hooks/charmhelpers/contrib/openstack/templating.py

hooks/charmhelpers/contrib/openstack/utils.py

hooks/charmhelpers/contrib/storage/linux/ceph.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.py

hooks/charmhelpers/core/hugepage.py

hooks/charmhelpers/core/strutils.py

hooks/install

hooks/neutron_api_context.py

hooks/neutron_api_hooks.py

hooks/neutron_api_utils.py

metadata.yaml

templates/icehouse/ml2_conf.ini

templates/icehouse/neutron.conf

templates/juno/neutron.conf

templates/kilo/ml2_conf.ini

templates/kilo/neutron.conf

tests/00-setup

tests/019-basic-vivid-kilo *

tests/README

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

unit_tests/test_neutron_api_context.py

unit_tests/test_neutron_api_hooks.py

unit_tests/test_neutron_api_utils.py

unit_tests/test_utils.py

Show diffs side-by-side

added added

removed removed

actions/openstack-upgrade@

actions/openstack_upgrade.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/neutron.py

hooks/charmhelpers/contrib/openstack/templates/ceph.conf

hooks/charmhelpers/contrib/openstack/templating.py

hooks/charmhelpers/contrib/openstack/utils.py

hooks/charmhelpers/contrib/storage/linux/ceph.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/core/host.py

hooks/charmhelpers/core/hugepage.py

hooks/charmhelpers/core/strutils.py

hooks/etcd-proxy-relation-broken@

hooks/etcd-proxy-relation-changed@

hooks/etcd-proxy-relation-departed@

hooks/etcd-proxy-relation-joined@

hooks/install.real@

hooks/neutron_api_context.py

hooks/neutron_api_hooks.py

hooks/neutron_api_utils.py

templates/icehouse/etcd.conf

templates/icehouse/ml2_conf.ini

templates/icehouse/neutron.conf

templates/icehouse/plumgrid.ini

templates/juno/neutron.conf

templates/kilo/ml2_conf.ini

templates/kilo/neutron.conf

templates/liberty/

templates/liberty/neutron.conf

templates/liberty/neutron_lbaas.conf

templates/liberty/neutron_vpnaas.conf

tests/020-basic-trusty-liberty

tests/021-basic-wily-liberty

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

tests/tests.yaml

unit_tests/test_actions_git_reinstall.py

unit_tests/test_actions_openstack_upgrade.py

unit_tests/test_neutron_api_context.py

unit_tests/test_neutron_api_hooks.py

unit_tests/test_neutron_api_utils.py

unit_tests/test_utils.py

Older »