Merge lp://staging/~tribaal/charms/trusty/ceph-osd/ceph-zap-fix into lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Proposed by Chris Glass
Status: Merged
Merged at revision: 47
Proposed branch: lp://staging/~tribaal/charms/trusty/ceph-osd/ceph-zap-fix
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Diff against target: 16 lines (+3/-2)
1 file modified
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
To merge this branch: bzr merge lp://staging/~tribaal/charms/trusty/ceph-osd/ceph-zap-fix
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+267310@code.staging.launchpad.net

Description of the change

Patching in changes form https://code.launchpad.net/~james-page/charm-helpers/lp-1475247/+merge/265125

The ceph disk zapping fails sometimes when issued in a single command, as described in https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b

This branche's purpose is to avoid a full charmhelpers sync before release.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7076 ceph-osd-next for tribaal mp267310
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/12019666/
Build: http://10.245.162.77:8080/job/charm_unit_test/7076/

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

charm_lint_check #7640 ceph-osd-next for tribaal mp267310
    LINT OK: passed

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

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

charm_unit_test #7079 ceph-osd-next for tribaal mp267310
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/12019807/
Build: http://10.245.162.77:8080/job/charm_unit_test/7079/

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

charm_lint_check #7643 ceph-osd-next for tribaal mp267310
    LINT OK: passed

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

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

charm_amulet_test #5653 ceph-osd-next for tribaal mp267310
    AMULET OK: passed

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

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

charm_amulet_test #5655 ceph-osd-next for tribaal mp267310
    AMULET OK: passed

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

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