Merge lp://staging/~junaidali/charms/trusty/plumgrid-edge/docker-oil into lp://staging/charms/trusty/plumgrid-edge

Proposed by Junaid Ali
Status: Merged
Merged at revision: 17
Proposed branch: lp://staging/~junaidali/charms/trusty/plumgrid-edge/docker-oil
Merge into: lp://staging/charms/trusty/plumgrid-edge
Diff against target: 263 lines (+96/-26)
7 files modified
config.yaml (+1/-12)
hooks/charmhelpers/contrib/openstack/neutron.py (+1/-1)
hooks/pg_edge_hooks.py (+6/-1)
hooks/pg_edge_utils.py (+81/-10)
templates/kilo/00-pg.conf (+2/-1)
templates/kilo/plumgrid.conf (+3/-0)
unit_tests/test_pg_edge_hooks.py (+2/-1)
To merge this branch: bzr merge lp://staging/~junaidali/charms/trusty/plumgrid-edge/docker-oil
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
David Ames Pending
Review via email: mp+304249@code.staging.launchpad.net

Description of the change

PLUMgrid docker package changes

To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5468/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5569/

review: Needs Fixing (automated testing)

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

to all changes: