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

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 128
Proposed branch: lp://qastaging/~hopem/charms/trusty/cinder/lp1499643
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 810 lines (+407/-53)
11 files modified
hooks/charmhelpers/contrib/network/ip.py (+5/-3)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-10)
hooks/charmhelpers/contrib/openstack/context.py (+52/-7)
hooks/charmhelpers/contrib/openstack/templating.py (+30/-2)
hooks/charmhelpers/contrib/openstack/utils.py (+181/-2)
hooks/charmhelpers/core/hookenv.py (+32/-0)
hooks/charmhelpers/core/hugepage.py (+8/-1)
hooks/charmhelpers/core/strutils.py (+30/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+4/-2)
tests/charmhelpers/contrib/amulet/utils.py (+47/-16)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-10)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/cinder/lp1499643
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+272532@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_lint_check #10886 cinder-next for hopem mp272532
    LINT OK: passed

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

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

charm_unit_test #10058 cinder-next for hopem mp272532
    UNIT OK: passed

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

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

Approve

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

charm_amulet_test #6841 cinder-next for hopem mp272532
    AMULET OK: passed

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

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