Merge lp://qastaging/~james-page/charms/trusty/midonet-agent/trunk into lp://qastaging/~celebdor/charms/trusty/midonet-agent/trunk
Proposed by
James Page
| Status: | Merged |
|---|---|
| Approved by: | Antoni Segura Puimedon |
| Approved revision: | 33 |
| Merged at revision: | 33 |
| Proposed branch: | lp://qastaging/~james-page/charms/trusty/midonet-agent/trunk |
| Merge into: | lp://qastaging/~celebdor/charms/trusty/midonet-agent/trunk |
| Diff against target: |
169 lines (+29/-46) 7 files modified
hooks/install (+12/-8) tests/006-minimal-trusty-kilo-mem.py (+1/-1) tests/010-basic-trusty-juno (+1/-1) tests/011-basic-trusty-kilo (+1/-1) tests/012-basic-trusty-liberty (+1/-1) tests/basic_deployment.py (+11/-18) unit_tests/test_context.py (+2/-16) |
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/midonet-agent/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Antoni Segura Puimedon | Pending | ||
|
Review via email:
|
|||
Description of the change
Misc fixes for tests from final review.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
