Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk into lp:charms/trusty/apache-hadoop-yarn-master
Proposed by
Kevin W Monroe
Status: | Merged |
---|---|
Merged at revision: | 90 |
Proposed branch: | lp:~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk |
Merge into: | lp:charms/trusty/apache-hadoop-yarn-master |
Diff against target: |
320 lines (+222/-10) (has conflicts) 9 files modified
README.md (+21/-0) config.yaml (+10/-0) hooks/callbacks.py (+42/-5) hooks/common.py (+24/-3) hooks/ganglia-relation-broken (+26/-0) hooks/ganglia-relation-changed (+26/-0) metadata.yaml (+2/-0) templates/hadoop-metrics2.properties.j2 (+69/-0) tests/01-basic-deployment.py (+2/-2) Text conflict in hooks/callbacks.py Text conflict in hooks/common.py |
To merge this branch: | bzr merge lp:~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin W Monroe | Approve | ||
Review via email: mp+271165@code.launchpad.net |
To post a comment you must log in.