Merge lp://qastaging/~james-page/charms/trusty/neutron-api/tox into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 154 |
| Proposed branch: | lp://qastaging/~james-page/charms/trusty/neutron-api/tox |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
| Diff against target: |
112 lines (+61/-2) 7 files modified
.bzrignore (+2/-0) .testr.conf (+8/-0) requirements.txt (+12/-0) test-requirements.txt (+8/-0) tests/basic_deployment.py (+1/-1) tox.ini (+29/-0) unit_tests/test_neutron_api_context.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/tox |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Corey Bryant (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Corey Bryant (corey.bryant) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Code looks good to me. I'll test it out shortly.