Juju Charms Collection
neutron-api package

Merge lp://qastaging/~james-page/charms/trusty/neutron-api/liberty into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. liberty
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 141
Proposed branch: lp://qastaging/~james-page/charms/trusty/neutron-api/liberty
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 275 lines (+168/-10)
6 files modified
hooks/neutron_api_utils.py (+18/-1)
templates/liberty/neutron.conf (+104/-0)
templates/liberty/neutron_lbaas.conf (+19/-0)
templates/liberty/neutron_vpnaas.conf (+7/-0)
unit_tests/test_neutron_api_hooks.py (+4/-6)
unit_tests/test_neutron_api_utils.py (+16/-3)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/liberty
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+271247@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-09-03.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_lint_check #9297 neutron-api-next for james-page mp270022
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #8596 neutron-api-next for james-page mp270022
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #6212 neutron-api-next for james-page mp270022
    AMULET OK: passed

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

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

charm_lint_check #10122 neutron-api-next for james-page mp271247
    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/12425345/
Build: http://10.245.162.77:8080/job/charm_lint_check/10122/

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

charm_unit_test #9285 neutron-api-next for james-page mp271247
    UNIT OK: passed

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

lp://qastaging/~james-page/charms/trusty/neutron-api/liberty updated
143. By James Page

Fixup lint

144. By James Page

Fixup more lint

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

LGTM

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

charm_amulet_test #6460 neutron-api-next for james-page mp271247
    AMULET FAIL: amulet-test failed

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

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

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