Merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/fix-neutron-query into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Liam Young
Status: Merged
Merged at revision: 107
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/neutron-api/fix-neutron-query
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 310 lines (+188/-13)
5 files modified
hooks/neutron_api_hooks.py (+14/-10)
hooks/neutron_api_utils.py (+23/-2)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+1/-1)
unit_tests/test_neutron_api_hooks.py (+24/-0)
unit_tests/test_neutron_api_utils.py (+126/-0)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/fix-neutron-query
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+256889@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3682 neutron-api-next for gnuoy mp256889
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3682/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3470 neutron-api-next for gnuoy mp256889
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3470/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #3476 neutron-api-next for gnuoy mp256889
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10860721/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3476/

Revision history for this message
James Page (james-page) :
review: Approve

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