Merge lp://qastaging/~billy-olsen/charms/trusty/swift-proxy/backport-lp-1351401 into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/trunk

Proposed by Billy Olsen
Status: Merged
Merged at revision: 83
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/swift-proxy/backport-lp-1351401
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/trunk
Diff against target: 30 lines (+12/-1)
1 file modified
hooks/charmhelpers/contrib/openstack/context.py (+12/-1)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/swift-proxy/backport-lp-1351401
Reviewer Review Type Date Requested Status
Liang Chen (community) Approve
Edward Hope-Morley Pending
OpenStack Charmers Pending
Review via email: mp+253606@code.qastaging.launchpad.net

Description of the change

Backport fix for lp 1351401

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

charm_lint_check #2766 swift-proxy for billy-olsen mp253606
    LINT OK: passed

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

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

charm_unit_test #2557 swift-proxy for billy-olsen mp253606
    UNIT OK: passed

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

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

charm_amulet_test #2605 swift-proxy for billy-olsen mp253606
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

Revision history for this message
Liang Chen (cbjchen) wrote :

LGTM

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