Merge lp:~bigdata-dev/charms/trusty/apache-flume-twitter/trunk into lp:charms/trusty/apache-flume-twitter
Proposed by
Cory Johns
Status: | Merged |
---|---|
Merged at revision: | 3 |
Proposed branch: | lp:~bigdata-dev/charms/trusty/apache-flume-twitter/trunk |
Merge into: | lp:charms/trusty/apache-flume-twitter |
Diff against target: |
167 lines (+31/-71) (has conflicts) 7 files modified
README.md (+1/-1) hooks/callbacks.py (+2/-2) resources.yaml (+1/-1) tests/00-setup (+0/-5) tests/01-basic-deployment.py (+24/-0) tests/remote/test_dist_config.py (+0/-62) tests/tests.yaml (+3/-0) Conflict adding files to tests. Moved to root. Path conflict: tests / <deleted> |
To merge this branch: | bzr merge lp:~bigdata-dev/charms/trusty/apache-flume-twitter/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin W Monroe | Approve | ||
Review via email: mp+273432@code.launchpad.net |
Description of the change
Remove trivial test in favor of bundle tests.
To post a comment you must log in.
LGTM