Merge lp://qastaging/~gnuoy/charms/trusty/quantum-gateway/neutron-refactor into lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next

Proposed by Liam Young
Status: Merged
Merged at revision: 52
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/quantum-gateway/neutron-refactor
Merge into: lp://qastaging/~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 322 lines (+135/-24)
7 files modified
config.yaml (+8/-0)
hooks/charmhelpers/contrib/openstack/context.py (+13/-5)
hooks/quantum_hooks.py (+17/-0)
hooks/quantum_utils.py (+8/-3)
metadata.yaml (+2/-0)
unit_tests/test_quantum_hooks.py (+47/-0)
unit_tests/test_quantum_utils.py (+40/-16)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/quantum-gateway/neutron-refactor
Reviewer Review Type Date Requested Status
Liam Young (community) Needs Resubmitting
James Page Needs Fixing
Review via email: mp+224068@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Merge to support seperate message broker for neutron traffic

Revision history for this message
James Page (james-page) :
review: Needs Fixing
60. By Liam Young

Fix merge confilct

61. By Liam Young

Merged in trunk

Revision history for this message
Liam Young (gnuoy) wrote :

Updated branch with updates suggested to mp

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches