Merge lp:~hopem/charms/trusty/neutron-gateway/fix-network-vlan-ranges-parser into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Proposed by
Edward Hope-Morley
Status: | Merged |
---|---|
Merged at revision: | 116 |
Proposed branch: | lp:~hopem/charms/trusty/neutron-gateway/fix-network-vlan-ranges-parser |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next |
Diff against target: |
335 lines (+131/-22) 8 files modified
config.yaml (+4/-2) hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+10/-5) hooks/charmhelpers/core/hookenv.py (+86/-10) hooks/charmhelpers/core/host.py (+1/-1) hooks/charmhelpers/core/services/base.py (+2/-2) hooks/charmhelpers/fetch/__init__.py (+1/-1) unit_tests/test_neutron_utils.py (+2/-1) |
To merge this branch: | bzr merge lp:~hopem/charms/trusty/neutron-gateway/fix-network-vlan-ranges-parser |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+258988@code.launchpad.net |
To post a comment you must log in.
Approve