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

Proposed by Liam Young
Status: Merged
Merged at revision: 108
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/neutron-api/kilo-neutron-dbmig
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 372 lines (+181/-5)
4 files modified
hooks/neutron_api_hooks.py (+27/-0)
hooks/neutron_api_utils.py (+34/-0)
unit_tests/test_neutron_api_hooks.py (+54/-2)
unit_tests/test_neutron_api_utils.py (+66/-3)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/kilo-neutron-dbmig
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+257225@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 #3855 neutron-api-next for gnuoy mp257225
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/10870003/
Build: http://10.245.162.77:8080/job/charm_lint_check/3855/

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

charm_unit_test #3642 neutron-api-next for gnuoy mp257225
    UNIT OK: passed

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

112. By Liam Young

Merge next

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

charm_lint_check #3856 neutron-api-next for gnuoy mp257225
    LINT OK: passed

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

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

charm_unit_test #3643 neutron-api-next for gnuoy mp257225
    UNIT OK: passed

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

113. By Liam Young

Only run migration if allowed units is present

114. By Liam Young

Remove erronious print

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

charm_lint_check #3858 neutron-api-next for gnuoy mp257225
    LINT OK: passed

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

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

charm_unit_test #3645 neutron-api-next for gnuoy mp257225
    UNIT OK: passed

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

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

charm_amulet_test #3643 neutron-api-next for gnuoy mp257225
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3643/

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

charm_amulet_test #3644 neutron-api-next for gnuoy mp257225
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3644/

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

charm_amulet_test #3646 neutron-api-next for gnuoy mp257225
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3646/

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