Merge lp:~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support into lp:~celebdor/charms/trusty/neutron-agents-midonet/split
Proposed by
James Page
Status: | Merged |
---|---|
Approved by: | Antoni Segura Puimedon |
Approved revision: | 43 |
Merged at revision: | 44 |
Proposed branch: | lp:~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support |
Merge into: | lp:~celebdor/charms/trusty/neutron-agents-midonet/split |
Diff against target: |
288 lines (+115/-23) 10 files modified
.bzrignore (+1/-0) config.yaml (+0/-4) hooks/install (+2/-1) hooks/services.py (+44/-12) templates/juno/nova.conf (+25/-0) templates/kilo/neutron.conf (+6/-0) templates/kilo/nova.conf (+29/-0) templates/metadata_agent.ini (+4/-2) tests/basic_deployment.py (+0/-1) unit_tests/test_templates.py (+4/-3) |
To merge this branch: | bzr merge lp:~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antoni Segura Puimedon | Pending | ||
Review via email:
|
To post a comment you must log in.