Merge lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk into lp:charms/trusty/apache-flume-hdfs
Proposed by
Kevin W Monroe
Status: | Merged |
---|---|
Merged at revision: | 3 |
Proposed branch: | lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk |
Merge into: | lp:charms/trusty/apache-flume-hdfs |
Diff against target: |
155 lines (+59/-14) (has conflicts) 7 files modified
README.md (+4/-5) actions.yaml (+6/-0) actions/restart-flume (+5/-0) actions/start-flume (+3/-0) actions/stop-flume (+3/-0) config.yaml (+32/-6) templates/flume.conf.j2 (+6/-3) Conflict adding files to actions. Moved to root. Conflict adding files to actions.yaml. Moved to root. |
To merge this branch: | bzr merge lp:~bigdata-dev/charms/trusty/apache-flume-hdfs/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin W Monroe | Approve | ||
Review via email: mp+271902@code.launchpad.net |
To post a comment you must log in.