Juju Charms Collection
neutron-api package

Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/sync-ch into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. sync-ch
  3. Merge into next
Proposed by Corey Bryant
Status: Merged
Merged at revision: 127
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/neutron-api/sync-ch
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 1562 lines (+878/-199)
16 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-3)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+240/-49)
hooks/charmhelpers/contrib/openstack/context.py (+8/-7)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6)
hooks/charmhelpers/contrib/openstack/utils.py (+9/-5)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-6)
hooks/charmhelpers/core/hookenv.py (+93/-36)
hooks/charmhelpers/core/host.py (+31/-5)
hooks/charmhelpers/core/services/base.py (+12/-9)
hooks/charmhelpers/core/services/helpers.py (+2/-2)
hooks/charmhelpers/fetch/__init__.py (+23/-14)
hooks/charmhelpers/fetch/archiveurl.py (+7/-1)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
tests/charmhelpers/contrib/amulet/utils.py (+128/-3)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-3)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+240/-49)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/sync-ch
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+265051@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 #6288 neutron-api-next for corey.bryant mp265051
    LINT OK: passed

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

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

charm_unit_test #5920 neutron-api-next for corey.bryant mp265051
    UNIT OK: passed

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

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

charm_amulet_test #5143 neutron-api-next for corey.bryant mp265051
    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/11890566/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5143/

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

charm_lint_check #6343 neutron-api-next for corey.bryant mp265051
    LINT OK: passed

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

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

charm_unit_test #5975 neutron-api-next for corey.bryant mp265051
    UNIT OK: passed

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

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

charm_amulet_test #5153 neutron-api-next for corey.bryant mp265051
    AMULET OK: passed

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

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