Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-gateway/git-ods into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 117 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/neutron-gateway/git-ods |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next |
Diff against target: |
687 lines (+151/-59) 9 files modified
hooks/charmhelpers/contrib/openstack/utils.py (+65/-18) hooks/charmhelpers/contrib/python/packages.py (+28/-5) hooks/charmhelpers/fetch/giturl.py (+7/-5) hooks/neutron_utils.py (+27/-13) templates/git/upstart/neutron-agent.upstart (+1/-1) templates/git/upstart/neutron-ovs-cleanup.upstart (+1/-1) templates/git/upstart/neutron-server.upstart (+1/-1) tests/basic_deployment.py (+2/-2) unit_tests/test_neutron_utils.py (+19/-13) |
To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-gateway/git-ods |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
To post a comment you must log in.