Juju Charms Collection
neutron-api package

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

  1. Trusty Tahr (14.04)
  2. kilo-support
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 75
Proposed branch: lp://qastaging/~james-page/charms/trusty/neutron-api/kilo-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 190 lines (+103/-7)
4 files modified
hooks/neutron_api_hooks.py (+4/-2)
hooks/neutron_api_utils.py (+10/-2)
templates/kilo/neutron.conf (+77/-0)
unit_tests/test_neutron_api_utils.py (+12/-3)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/kilo-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
OpenStack Charmers Pending
Review via email: mp+247104@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-01-21.

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

charm_lint_check #924 neutron-api-next for james-page mp247104
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:117:21: E126 continuation line over-indented for hanging indent
  make: *** [lint] Error 1

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

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

charm_unit_test #953 neutron-api-next for james-page mp247104
    UNIT OK: passed

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

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

charm_amulet_test #1146 neutron-api-next for james-page mp247104
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI, all deploy tests are happy. [P-I, T-I, T-J, U-J] x [Stable & Next] charms.

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI, all deploy tests are happy. [P-I, T-I, T-J, U-J] x [Stable & Next] charms.

lp://qastaging/~james-page/charms/trusty/neutron-api/kilo-support updated
74. By James Page

Rebase

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

charm_lint_check #1500 neutron-api-next for james-page mp247104
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/neutron_api_hooks.py:117:21: E126 continuation line over-indented for hanging indent
  make: *** [lint] Error 1

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

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

charm_unit_test #1453 neutron-api-next for james-page mp247104
    UNIT OK: passed

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

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

charm_amulet_test #1617 neutron-api-next for james-page mp247104
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

lp://qastaging/~james-page/charms/trusty/neutron-api/kilo-support updated
75. By James Page

tidy lint

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

charm_lint_check #1508 neutron-api-next for james-page mp247104
    LINT OK: passed

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

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

charm_unit_test #1463 neutron-api-next for james-page mp247104
    UNIT OK: passed

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

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

charm_amulet_test #1627 neutron-api-next for james-page mp247104
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

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

Approve

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