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

Proposed by Billy Olsen
Status: Merged
Merged at revision: 119
Proposed branch: lp://staging/~billy-olsen/charms/trusty/glance/backport-lp1398182
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 386 lines (+132/-59)
4 files modified
config.yaml (+12/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+49/-44)
unit_tests/test_glance_relations.py (+46/-15)
To merge this branch: bzr merge lp://staging/~billy-olsen/charms/trusty/glance/backport-lp1398182
Reviewer Review Type Date Requested Status
Corey Bryant Approve
Review via email: mp+262002@code.staging.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 #5405 glance for billy-olsen mp262002
    LINT OK: passed

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

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

charm_unit_test #5037 glance for billy-olsen mp262002
    UNIT OK: passed

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

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

charm_amulet_test #4648 glance for billy-olsen mp262002
    AMULET OK: passed

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

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

Official c-h stable sync

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

charm_lint_check #5463 glance for billy-olsen mp262002
    LINT OK: passed

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

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

charm_unit_test #5095 glance for billy-olsen mp262002
    UNIT OK: passed

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

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

charm_amulet_test #4667 glance for billy-olsen mp262002
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #4678 glance for billy-olsen mp262002
    AMULET OK: passed

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

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