Merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/unstable into lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk
Proposed by
Kevin W Monroe
| Status: | Merged |
|---|---|
| Merged at revision: | 113 |
| Proposed branch: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/unstable |
| Merge into: | lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/trunk |
| Diff against target: |
35 lines (+12/-1) (has conflicts) 2 files modified
dist.yaml (+1/-1) resources.yaml (+11/-0) Text conflict in resources.yaml |
| To merge this branch: | bzr merge lp://staging/~bigdata-dev/charms/trusty/apache-hadoop-compute-slave/unstable |
| 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
+1 LGTM