Juju Charms Collection
swift-proxy package

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

  1. Trusty Tahr (14.04)
  2. lp1531102-trunk
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 107
Proposed branch: lp://qastaging/~james-page/charms/trusty/swift-proxy/lp1531102-trunk
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-proxy/trunk
Diff against target: 566 lines (+285/-26)
7 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
charmhelpers/contrib/openstack/utils.py (+21/-17)
charmhelpers/core/host.py (+12/-1)
charmhelpers/core/hugepage.py (+2/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/swift-proxy/lp1531102-trunk
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+281872@code.qastaging.launchpad.net

Commit message

Resync helpers

Description of the change

Resync stable helpers to resolve liberty point release issues.

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

charm_lint_check #16739 swift-proxy for james-page mp281872
    LINT OK: passed

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

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

charm_unit_test #15637 swift-proxy for james-page mp281872
    UNIT OK: passed

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

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

charm_amulet_test #8563 swift-proxy for james-page mp281872
    AMULET OK: passed

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

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

approve

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