Juju Charms Collection
swift-proxy package

Merge lp://qastaging/~hopem/charms/trusty/swift-proxy/lp1499643 into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. lp1499643
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 115
Proposed branch: lp://qastaging/~hopem/charms/trusty/swift-proxy/lp1499643
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 2266 lines (+1613/-108)
14 files modified
charmhelpers/contrib/network/ip.py (+5/-3)
charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9)
charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
charmhelpers/contrib/openstack/context.py (+60/-16)
charmhelpers/contrib/openstack/templating.py (+30/-2)
charmhelpers/contrib/openstack/utils.py (+181/-2)
charmhelpers/contrib/storage/linux/ceph.py (+224/-2)
charmhelpers/core/hookenv.py (+32/-0)
charmhelpers/core/hugepage.py (+8/-1)
charmhelpers/core/strutils.py (+30/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+4/-2)
tests/charmhelpers/contrib/amulet/utils.py (+275/-62)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/swift-proxy/lp1499643
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+272415@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9940 swift-proxy-next for hopem mp272415
    UNIT OK: passed

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

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

charm_lint_check #10766 swift-proxy-next for hopem mp272415
    LINT OK: passed

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

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

charm_amulet_test #6773 swift-proxy-next for hopem mp272415
    AMULET FAIL: amulet-test failed

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

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

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

Amulet fail is unrelated. 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