Juju Charms Collection
neutron-gateway package

Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-gateway/sync-ch into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next

Proposed by Corey Bryant on 2015-07-16

Status:	Merged
Merged at revision:	128
Proposed branch:	lp://qastaging/~corey.bryant/charms/trusty/neutron-gateway/sync-ch
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Diff against target:	1651 lines (+924/-202) 17 files modified hooks/charmhelpers/contrib/network/ufw.py (+46/-3) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-3) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+240/-49) hooks/charmhelpers/contrib/openstack/context.py (+8/-7) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6) hooks/charmhelpers/contrib/openstack/utils.py (+9/-5) hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-6) hooks/charmhelpers/core/hookenv.py (+93/-36) hooks/charmhelpers/core/host.py (+31/-5) hooks/charmhelpers/core/services/base.py (+12/-9) hooks/charmhelpers/core/services/helpers.py (+2/-2) hooks/charmhelpers/fetch/__init__.py (+23/-14) hooks/charmhelpers/fetch/archiveurl.py (+7/-1) hooks/charmhelpers/fetch/giturl.py (+1/-1) tests/charmhelpers/contrib/amulet/utils.py (+128/-3) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-3) tests/charmhelpers/contrib/openstack/amulet/utils.py (+240/-49)
To merge this branch:	bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-gateway/sync-ch
Related bugs:	Link a bug report