Merge lp://qastaging/~james-page/charms/trusty/neutron-api/network-splits into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 38 |
| Proposed branch: | lp://qastaging/~james-page/charms/trusty/neutron-api/network-splits |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
| Diff against target: |
1278 lines (+573/-145) 24 files modified
.project (+17/-0) .pydevproject (+9/-0) Makefile (+1/-2) charm-helpers-sync.yaml (+1/-0) config.yaml (+28/-9) hooks/charmhelpers/contrib/hahelpers/cluster.py (+3/-2) hooks/charmhelpers/contrib/network/ip.py (+156/-0) hooks/charmhelpers/contrib/network/ovs/__init__.py (+6/-1) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+24/-7) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+61/-3) hooks/charmhelpers/contrib/openstack/context.py (+60/-20) hooks/charmhelpers/contrib/openstack/ip.py (+75/-0) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+6/-1) hooks/charmhelpers/contrib/openstack/templating.py (+22/-23) hooks/charmhelpers/contrib/openstack/utils.py (+2/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1) hooks/charmhelpers/core/hookenv.py (+5/-4) hooks/charmhelpers/core/host.py (+11/-5) hooks/charmhelpers/fetch/__init__.py (+23/-15) hooks/neutron_api_hooks.py (+43/-9) hooks/neutron_api_utils.py (+1/-18) unit_tests/test_neutron_api_context.py (+5/-2) unit_tests/test_neutron_api_hooks.py (+13/-9) unit_tests/test_neutron_api_utils.py (+0/-14) |
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/network-splits |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
| James Page | Needs Resubmitting | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| James Page (james-page) | # |
review:
Needs Resubmitting
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
$ make lint
hooks/neutron_
hooks/neutron_
Makefile:5: recipe for target 'lint' failed
make: *** [lint] Error 1