Merge lp://qastaging/~hopem/charms/trusty/ceph-osd/lp1523871 into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 67
Proposed branch: lp://qastaging/~hopem/charms/trusty/ceph-osd/lp1523871
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Diff against target: 117 lines (+33/-12)
3 files modified
config.yaml (+6/-0)
hooks/ceph_hooks.py (+14/-7)
hooks/utils.py (+13/-5)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/ceph-osd/lp1523871
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+284937@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 #128 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/128/

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

charm_unit_test #130 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/130/

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

charm_amulet_test #15 ceph-osd-next for hopem mp284937
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/15/

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

charm_lint_check #149 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/149/

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

charm_unit_test #142 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/142/

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

charm_amulet_test #89 ceph-osd-next for hopem mp284937
    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/15016055/
Build: http://10.245.162.36:8080/job/charm_amulet_test/89/

62. By Edward Hope-Morley

post-review fixes

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

charm_unit_test #731 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/731/

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

charm_lint_check #828 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/828/

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

charm_amulet_test #328 ceph-osd-next for hopem mp284937
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/328/

63. By Edward Hope-Morley

remove unused function

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

charm_unit_test #751 ceph-osd-next for hopem mp284937
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/751/

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

charm_lint_check #848 ceph-osd-next for hopem mp284937
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/848/

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

charm_amulet_test #346 ceph-osd-next for hopem mp284937
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/346/

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