Juju Charms Collection
nova-cloud-controller package

Merge lp://qastaging/~gnuoy/charms/trusty/nova-cloud-controller/workload-status into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

  1. Trusty Tahr (14.04)
  2. workload-status
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 200
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/nova-cloud-controller/workload-status
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 388 lines (+108/-17)
10 files modified
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
hooks/charmhelpers/contrib/openstack/context.py (+15/-4)
hooks/charmhelpers/contrib/openstack/neutron.py (+3/-3)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0)
hooks/nova_cc_context.py (+15/-2)
hooks/nova_cc_hooks.py (+20/-3)
hooks/nova_cc_utils.py (+43/-3)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
unit_tests/test_nova_cc_hooks.py (+1/-0)
unit_tests/test_utils.py (+3/-0)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/nova-cloud-controller/workload-status
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+273837@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 #11534 nova-cloud-controller-next for gnuoy mp273837
    LINT OK: passed

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

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

charm_unit_test #10726 nova-cloud-controller-next for gnuoy mp273837
    UNIT OK: passed

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

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

charm_amulet_test #7239 nova-cloud-controller-next for gnuoy mp273837
    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/12718842/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7239/

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