[
https://issues.apache.org/jira/browse/YARN-2968?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14247854#comment-14247854
]
Karthik Kambatla commented on YARN-2968:
----------------------------------------
Pretty bad on my part. Resolved another conflict at commit time, but looks like
I missed this one. Taking care of it with an addendum patch to the same JIRA.
> yarn shell script has unresolved merge conflicts in checkin
> -----------------------------------------------------------
>
> Key: YARN-2968
> URL: https://issues.apache.org/jira/browse/YARN-2968
> Project: Hadoop YARN
> Issue Type: Bug
> Reporter: Prakash Ramachandran
> Assignee: Varun Saxena
> Priority: Blocker
>
> in the branch-2 yarn command has unresolved merge conflicts
> https://github.com/apache/hadoop/blob/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
> commit - aadd0c392be66080f
> see line 203, 106
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
