Merge lp://qastaging/~gnuoy/charms/trusty/cisco-vpp/1515343 into lp://qastaging/~openstack-charmers/charms/trusty/cisco-vpp/next
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 117 |
Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/cisco-vpp/1515343 |
Merge into: | lp://qastaging/~openstack-charmers/charms/trusty/cisco-vpp/next |
Prerequisite: | lp://qastaging/~gnuoy/charms/trusty/cisco-vpp/dhcp |
Diff against target: |
104 lines (+36/-3) 5 files modified
hooks/services.py (+1/-0) hooks/vpp_data.py (+8/-0) hooks/vpp_utils.py (+17/-2) templates/icehouse/neutron.conf (+1/-1) templates/qn.conf (+9/-0) |
To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/cisco-vpp/1515343 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+278820@code.qastaging.launchpad.net |
To post a comment you must log in.
Minor tidy points.