Merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk into lp://staging/charms/trusty/apache-hadoop-compute-slave
Proposed by
Kevin W Monroe
| Status: | Merged |
|---|---|
| Merged at revision: | 88 |
| Proposed branch: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk |
| Merge into: | lp://staging/charms/trusty/apache-hadoop-compute-slave |
| Diff against target: |
412 lines (+289/-35) (has conflicts) 9 files modified
README.md (+25/-0) config.yaml (+10/-0) hooks/callbacks.py (+106/-30) hooks/common.py (+23/-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://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin W Monroe (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Kevin W Monroe (kwmonroe) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
