Merge lp://qastaging/~johnsca/charms/trusty/rsyslog-forwarder-ha/cwr into lp://qastaging/charms/trusty/rsyslog-forwarder-ha
Proposed by
Cory Johns
Status: | Merged |
---|---|
Merged at revision: | 10 |
Proposed branch: | lp://qastaging/~johnsca/charms/trusty/rsyslog-forwarder-ha/cwr |
Merge into: | lp://qastaging/charms/trusty/rsyslog-forwarder-ha |
Diff against target: |
185 lines (+22/-93) 8 files modified
.bzrignore (+1/-0) Makefile (+3/-7) metadata.yaml (+1/-1) test_requirements.txt (+0/-12) tests/00_setup.sh (+14/-0) tests/10_deploy_test.py (+3/-11) tests/functional/00_setup.sh (+0/-14) tests/functional/10_deploy_test.py (+0/-48) |
To merge this branch: | bzr merge lp://qastaging/~johnsca/charms/trusty/rsyslog-forwarder-ha/cwr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Van Steenburgh (community) | Approve | ||
Review via email:
|
Description of the change
Cleanup of tests to get passing on CWR as part of the realtime-
To post a comment you must log in.
Excellent, thanks Cory.