Merge into trunk : trunk : Trusty Tahr (14.04) : Code : apache-hadoop-yarn-master package : Juju Charms Collection

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)
9 files modified
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
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.
Revision history for this message
Kevin W Monroe (kwmonroe) :
review: Approve

Preview Diff

Failed to fetch available diffs.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches