Merge lp://staging/~james-page/charms/trusty/swift-storage/lp1531102 into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Proposed by James Page
Status: Merged
Merged at revision: 98
Proposed branch: lp://staging/~james-page/charms/trusty/swift-storage/lp1531102
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 198 lines (+61/-42)
2 files modified
charmhelpers/contrib/openstack/utils.py (+27/-25)
charmhelpers/core/host.py (+34/-17)
To merge this branch: bzr merge lp://staging/~james-page/charms/trusty/swift-storage/lp1531102
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+281619@code.staging.launchpad.net

Commit message

Resync helpers

Description of the change

Resync helpers

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #16591 swift-storage-next for james-page mp281619
    LINT OK: passed

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

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

charm_unit_test #15497 swift-storage-next for james-page mp281619
    UNIT OK: passed

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

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

charm_amulet_test #8514 swift-storage-next for james-page mp281619
    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/14411354/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8514/

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

charm_amulet_test #8522 swift-storage-next for james-page mp281619
    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/14413236/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8522/

99. By James Page

Resync charm helpers to resolve systemd related amulet test failures.

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

charm_lint_check #16725 swift-storage-next for james-page mp281619
    LINT OK: passed

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

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

charm_unit_test #15618 swift-storage-next for james-page mp281619
    UNIT OK: passed

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

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

charm_amulet_test #8548 swift-storage-next for james-page mp281619
    AMULET OK: passed

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

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