hadoop-yarn-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Prakash Ramachandran (JIRA)" <j...@apache.org>
Subject [jira] [Created] (YARN-2968) yarn shell script has unresolved merge conflicts in checkin
Date Tue, 16 Dec 2014 05:06:13 GMT
Prakash Ramachandran created YARN-2968:
------------------------------------------

             Summary: 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


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)

Mime
View raw message