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

Proposed by James Page
Status: Merged
Merged at revision: 131
Proposed branch: lp://qastaging/~james-page/charms/trusty/swift-proxy/lp1531102
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/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://qastaging/~james-page/charms/trusty/swift-proxy/lp1531102
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+281618@code.qastaging.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 #16595 swift-proxy-next for james-page mp281618
    LINT OK: passed

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

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

charm_unit_test #15499 swift-proxy-next for james-page mp281618
    UNIT OK: passed

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

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

charm_amulet_test #8511 swift-proxy-next for james-page mp281618
    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/14410337/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8511/

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

charm_amulet_test #8537 swift-proxy-next for james-page mp281618
    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/14421054/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8537/

132. By James Page

Fixup systemd based test failures

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

charm_lint_check #16723 swift-proxy-next for james-page mp281618
    LINT OK: passed

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

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

charm_unit_test #15617 swift-proxy-next for james-page mp281618
    UNIT OK: passed

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

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

charm_amulet_test #8550 swift-proxy-next for james-page mp281618
    AMULET OK: passed

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

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