Merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk into lp://staging/charms/trusty/apache-hadoop-hdfs-secondary
Proposed by
Kevin W Monroe
| Status: | Merged |
|---|---|
| Merged at revision: | 68 |
| Proposed branch: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/trunk |
| Merge into: | lp://staging/charms/trusty/apache-hadoop-hdfs-secondary |
| Diff against target: |
181 lines (+47/-46) (has conflicts) 7 files modified
DEV-README.md (+7/-0) README.md (+7/-5) dist.yaml (+0/-40) hooks/callbacks.py (+4/-0) hooks/common.py (+2/-0) hooks/secondary-relation-departed (+26/-0) resources.yaml (+1/-1) Text conflict in DEV-README.md Conflict adding file resources/python/jujuresources-0.2.9.tar.gz. Moved existing file to resources/python/jujuresources-0.2.9.tar.gz.moved. |
| To merge this branch: | bzr merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-hdfs-secondary/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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Realtime syslog analytics bundle test looked good. Merged.