Merge lp://qastaging/~hopem/charms/trusty/glance/pki-token-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 101
Proposed branch: lp://qastaging/~hopem/charms/trusty/glance/pki-token-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 121 lines (+49/-11)
4 files modified
hooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/glance_utils.py (+6/-2)
templates/parts/keystone (+1/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/glance/pki-token-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250368@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 #2135 glance-next for hopem mp250368
    LINT OK: passed

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

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

charm_unit_test #1924 glance-next for hopem mp250368
    UNIT OK: passed

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

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

charm_amulet_test #2043 glance-next for hopem mp250368
    AMULET OK: passed

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

101. By Edward Hope-Morley

synced /next

102. By Edward Hope-Morley

synced charm-helpers;

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

charm_lint_check #2208 glance-next for hopem mp250368
    LINT OK: passed

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

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

charm_unit_test #1997 glance-next for hopem mp250368
    UNIT OK: passed

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

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

charm_amulet_test #2154 glance-next for hopem mp250368
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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