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

Proposed by Liam Young
Status: Merged
Merged at revision: 122
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/glance/1453940-stable
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 623 lines (+294/-73)
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/core/hookenv.py (+1/-20)
hooks/charmhelpers/core/host.py (+2/-2)
hooks/glance_relations.py (+13/-19)
templates/ceph.conf (+2/-1)
unit_tests/test_glance_relations.py (+9/-6)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/glance/1453940-stable
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Review via email: mp+271262@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 #10410 glance for gnuoy mp271262
    LINT OK: passed

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

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

charm_amulet_test #6555 glance for gnuoy mp271262
    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/12514441/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6555/

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

charm_unit_test #9626 glance for gnuoy mp271262
    UNIT OK: passed

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

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

charm_lint_check #10437 glance for gnuoy mp271262
    LINT OK: passed

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

125. By Liam Young

Empty commit to trigger osci

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

charm_lint_check #10458 glance for gnuoy mp271262
    LINT OK: passed

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

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

charm_unit_test #9648 glance for gnuoy mp271262
    UNIT OK: passed

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

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

charm_amulet_test #6582 glance for gnuoy mp271262
    AMULET OK: passed

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

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 #6602 glance for gnuoy mp271262
    AMULET OK: passed

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

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