Juju Charms Collection
swift-storage package

Merge lp://staging/~tribaal/charms/trusty/swift-storage/backport-1496004-to-stable into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk

  1. Trusty Tahr (14.04)
  2. backport-1496004-to-stable
  3. Merge into trunk
Proposed by Chris Glass
Status: Merged
Merged at revision: 72
Proposed branch: lp://staging/~tribaal/charms/trusty/swift-storage/backport-1496004-to-stable
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Diff against target: 139 lines (+72/-6)
2 files modified
hooks/swift_storage_utils.py (+39/-5)
unit_tests/test_swift_storage_utils.py (+33/-1)
To merge this branch: bzr merge lp://staging/~tribaal/charms/trusty/swift-storage/backport-1496004-to-stable
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
David Britton (community) Approve
Review via email: mp+273547@code.staging.launchpad.net

Description of the change

This is a backport of the fixes introduced in https://code.launchpad.net/~gnuoy/charms/trusty/swift-storage/lp1496004/+merge/273209 .

Note that the only difference in terms of diff is that the swift_storage_utils.py file is in the "hooks" folder here instead of the "lib/" folder in the -next branch.

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

charm_unit_test #10581 swift-storage for tribaal mp273547
    UNIT OK: passed

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

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

charm_lint_check #11390 swift-storage for tribaal mp273547
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12697465/
Build: http://10.245.162.77:8080/job/charm_lint_check/11390/

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

Looks like a straight backport, diff looks good. +1

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

charm_amulet_test #7137 swift-storage for tribaal mp273547
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

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