Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk into lp:charms/trusty/apache-hadoop-client
Proposed by
Kevin W Monroe
Status: | Merged |
---|---|
Merged at revision: | 100 |
Proposed branch: | lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk |
Merge into: | lp:charms/trusty/apache-hadoop-client |
Diff against target: |
38 lines (+13/-1) (has conflicts) 3 files modified
README.md (+4/-0) hooks/hadoop-plugin-relation-changed (+7/-1) hooks/hadoop-plugin-relation-departed (+2/-0) Text conflict in README.md |
To merge this branch: | bzr merge lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin W Monroe | Approve | ||
Review via email: mp+268666@code.launchpad.net |
To post a comment you must log in.
Realtime syslog analytics bundle test looked good. Merged.