Merge lp://qastaging/~billy-olsen/charms/trusty/cinder/backport-lp1398182 into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/trunk

Proposed by Billy Olsen
Status: Merged
Merged at revision: 96
Proposed branch: lp://qastaging/~billy-olsen/charms/trusty/cinder/backport-lp1398182
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/trunk
Diff against target: 320 lines (+132/-50)
4 files modified
config.yaml (+13/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+49/-44)
unit_tests/test_cinder_hooks.py (+45/-6)
To merge this branch: bzr merge lp://qastaging/~billy-olsen/charms/trusty/cinder/backport-lp1398182
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+262001@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 #5404 cinder for billy-olsen mp262001
    LINT OK: passed

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

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

charm_unit_test #5036 cinder for billy-olsen mp262001
    UNIT OK: passed

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

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

charm_amulet_test #4647 cinder for billy-olsen mp262001
    AMULET OK: passed

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

Revision history for this message
Corey Bryant (corey.bryant) :
review: Approve
97. By Billy Olsen

[billy-olsen] Official c-h stable sync

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

charm_lint_check #5462 cinder for billy-olsen mp262001
    LINT OK: passed

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

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

charm_unit_test #5094 cinder for billy-olsen mp262001
    UNIT OK: passed

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

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

charm_amulet_test #4666 cinder for billy-olsen mp262001
    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/11738076/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4666/

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

charm_amulet_test #4679 cinder for billy-olsen mp262001
    AMULET OK: passed

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

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