Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problems in yarn.cmd due to rebase.

Browse Source
This commit is contained in:
Varun Saxena 2017-10-15 01:25:32 +05:30
parent 572ebd1a95
commit 6ba1f34532
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
View File

@ -246,16 +246,15 @@ goto :eof
) )
goto :eof goto :eof
<<<<<<< HEAD
:router :router
set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\router-config\log4j.properties set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\router-config\log4j.properties
set CLASS=org.apache.hadoop.yarn.server.router.Router set CLASS=org.apache.hadoop.yarn.server.router.Router
set YARN_OPTS=%YARN_OPTS% %HADOOP_ROUTER_OPTS% set YARN_OPTS=%YARN_OPTS% %HADOOP_ROUTER_OPTS%
======= goto :eof
:timelinereader :timelinereader
set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties
set CLASS=org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer set CLASS=org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer
>>>>>>> YARN-5355. Backported YARN-2928 into our branch-2 feature branch.
goto :eof goto :eof
:nodemanager :nodemanager