Merge lp:~junaidali/charms/trusty/plumgrid-edge/docker-oil into lp:charms/trusty/plumgrid-edge
Proposed by
Junaid Ali
Status: | Merged |
---|---|
Merged at revision: | 17 |
Proposed branch: | lp:~junaidali/charms/trusty/plumgrid-edge/docker-oil |
Merge into: | lp: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:~junaidali/charms/trusty/plumgrid-edge/docker-oil |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Review Queue (community) | automated testing | Needs Fixing | |
David Ames | Pending | ||
Review via email: mp+304249@code.launchpad.net |
Description of the change
PLUMgrid docker package changes
To post a comment you must log in.
This item has failed automated testing! Results available here http:// juju-ci. vapour. ws/job/ charm-bundle- test-lxc/ 5468/