Juju Charms Collection
neutron-api package

Merge lp://qastaging/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. next-r140-amulet-fixes
  3. Merge into next
Proposed by Björn Tillenius
Status: Merged
Merged at revision: 144
Proposed branch: lp://qastaging/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 14 lines (+2/-2)
1 file modified
tests/basic_deployment.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+270630@code.qastaging.launchpad.net

Description of the change

Fix amulet failures introduced by r140.

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

charm_lint_check #9705 neutron-api-next for bjornt mp270630
    LINT OK: passed

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

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

charm_unit_test #8945 neutron-api-next for bjornt mp270630
    UNIT OK: passed

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

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

charm_amulet_test #6334 neutron-api-next for bjornt mp270630
    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/12328687/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6334/

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

Looks good, the amulet fail above does not seem related to this branch and the preceding tests all passed. thanks for the fix!

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