Merge lp://qastaging/~james-page/charms/trusty/neutron-api/midonet-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 171 |
| Proposed branch: | lp://qastaging/~james-page/charms/trusty/neutron-api/midonet-support |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
| Diff against target: |
878 lines (+329/-77) 19 files modified
config.yaml (+23/-0) files/midokura.key (+19/-0) files/midonet.key (+24/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1) hooks/charmhelpers/contrib/openstack/neutron.py (+14/-6) hooks/charmhelpers/contrib/openstack/utils.py (+63/-30) hooks/charmhelpers/core/host.py (+41/-26) hooks/charmhelpers/fetch/giturl.py (+5/-3) hooks/neutron_api_context.py (+24/-0) hooks/neutron_api_hooks.py (+19/-6) hooks/neutron_api_utils.py (+31/-1) metadata.yaml (+2/-0) templates/juno/midonet.ini (+11/-0) templates/juno/neutron.conf (+2/-0) templates/kilo/neutron.conf (+5/-1) templates/liberty/neutron.conf (+3/-1) templates/liberty/neutron_lbaas.conf (+5/-1) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1) unit_tests/test_neutron_api_context.py (+34/-0) |
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/midonet-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Re-test changes for midonet landing
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #18449 neutron-api-next for james-page mp284674
LINT OK: passed
Build: http://