Merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/ganglia_metrics into lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk
Proposed by
Andrew McLeod
| Status: | Merged |
|---|---|
| Merged at revision: | 103 |
| Proposed branch: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/ganglia_metrics |
| Merge into: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk |
| Diff against target: |
252 lines (+178/-1) (has conflicts) 8 files modified
DEV-README.md (+5/-0) config.yaml (+4/-0) hooks/callbacks.py (+31/-1) hooks/common.py (+15/-0) hooks/ganglia-relation-broken (+26/-0) hooks/ganglia-relation-changed (+26/-0) metadata.yaml (+2/-0) templates/hadoop-metrics2.properties.j2 (+69/-0) Text conflict in DEV-README.md |
| To merge this branch: | bzr merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/ganglia_metrics |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Big Data Development | Pending | ||
|
Review via email:
|
|||
Description of the change
Added capability to send ganglia metrics is relationship exists
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
