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

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 144
Proposed branch: lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 145 lines (+53/-13)
5 files modified
hooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/nova_cc_utils.py (+9/-3)
templates/icehouse/neutron.conf (+1/-1)
templates/kilo/nova.conf (+1/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/nova-cloud-controller/pki-token-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250371@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 #2137 nova-cloud-controller-next for hopem mp250371
    LINT OK: passed

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

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

charm_unit_test #1926 nova-cloud-controller-next for hopem mp250371
    UNIT OK: passed

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

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

charm_amulet_test #2045 nova-cloud-controller-next for hopem mp250371
    AMULET OK: passed

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

143. By Edward Hope-Morley

synced /next

144. By Edward Hope-Morley

synced charm-helpers;

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

charm_lint_check #2210 nova-cloud-controller-next for hopem mp250371
    LINT OK: passed

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

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

charm_unit_test #1999 nova-cloud-controller-next for hopem mp250371
    UNIT OK: passed

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

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

charm_amulet_test #2156 nova-cloud-controller-next for hopem mp250371
    AMULET OK: passed

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

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

Approve

Revision history for this message
Liam Young (gnuoy) :
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