Merge lp://qastaging/~gnuoy/charms/trusty/swift-storage/lp1496004 into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Proposed by Liam Young
Status: Merged
Merged at revision: 85
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/swift-storage/lp1496004
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 139 lines (+72/-6)
2 files modified
lib/swift_storage_utils.py (+39/-5)
unit_tests/test_swift_storage_utils.py (+33/-1)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/swift-storage/lp1496004
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Review via email: mp+273209@code.qastaging.launchpad.net
To post a comment you must log in.
87. By Liam Young

Add comment to get_mount_point

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

charm_unit_test #10361 swift-storage-next for gnuoy mp273209
    UNIT OK: passed

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

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

charm_lint_check #11158 swift-storage-next for gnuoy mp273209
    LINT OK: passed

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

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

charm_amulet_test #6988 swift-storage-next for gnuoy mp273209
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12639377/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6988/

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

charm_amulet_test #6993 swift-storage-next for gnuoy mp273209
    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/12640819/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6993/

Revision history for this message
David Britton (dpb) wrote :

I have tested a full deploy in the autopilot with swift/ceph and this charm fixes the problem (with devices: guess).

88. By Liam Young

Empty commit to kick osci

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

This looks good, thanks a lot!

+1, will merge once OSCI ran over it.

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

charm_lint_check #11326 swift-storage-next for gnuoy mp273209
    LINT OK: passed

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

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

charm_unit_test #10520 swift-storage-next for gnuoy mp273209
    UNIT OK: passed

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

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

charm_amulet_test #7110 swift-storage-next for gnuoy mp273209
    AMULET OK: passed

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

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

Good stuff, merging.

review: Approve

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