Merge lp://qastaging/~gnuoy/charms/trusty/cinder/1453940-stable into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/trunk

Proposed by Liam Young
Status: Merged
Merged at revision: 100
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/cinder/1453940-stable
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/trunk
Diff against target: 643 lines (+295/-82)
11 files modified
hooks/charmhelpers/cli/__init__.py (+1/-5)
hooks/charmhelpers/cli/commands.py (+4/-4)
hooks/charmhelpers/cli/hookenv.py (+23/-0)
hooks/charmhelpers/contrib/openstack/context.py (+8/-9)
hooks/charmhelpers/contrib/openstack/utils.py (+7/-5)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/hookenv.py (+1/-20)
hooks/charmhelpers/core/host.py (+2/-2)
hooks/cinder_hooks.py (+13/-19)
unit_tests/test_cinder_hooks.py (+9/-14)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/cinder/1453940-stable
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Review via email: mp+271259@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 #10406 cinder for gnuoy mp271259
    LINT OK: passed

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

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

charm_unit_test #9554 cinder for gnuoy mp271259
    UNIT OK: passed

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

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

charm_amulet_test #6553 cinder for gnuoy mp271259
    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/12514382/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6553/

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

charm_lint_check #10435 cinder for gnuoy mp271259
    LINT OK: passed

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

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

charm_unit_test #9628 cinder for gnuoy mp271259
    UNIT OK: passed

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

102. By Liam Young

Empty commit to trigger osci

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

charm_lint_check #10461 cinder for gnuoy mp271259
    LINT OK: passed

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

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

charm_unit_test #9649 cinder for gnuoy mp271259
    UNIT OK: passed

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

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

charm_amulet_test #6580 cinder for gnuoy mp271259
    AMULET OK: passed

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

Revision history for this message
Chris Glass (tribaal) wrote :

Looks good! +1

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

charm_amulet_test #6601 cinder for gnuoy mp271259
    AMULET OK: passed

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

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