Merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk into lp://staging/charms/trusty/apache-hadoop-yarn-master
Proposed by
Kevin W Monroe
Status: | Merged |
---|---|
Merged at revision: | 90 |
Proposed branch: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-yarn-master/trunk |
Merge into: | lp://staging/charms/trusty/apache-hadoop-yarn-master |
Diff against target: |
320 lines (+222/-10) (has conflicts)
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-yarn-master/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kevin W Monroe (community) | Approve | ||
Review via email: mp+271165@code.staging.launchpad.net |
To post a comment you must log in.