Fix problems in yarn.cmd due to rebase.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6ba1f345 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ba1f345 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ba1f345 Branch: refs/heads/branch-2 Commit: 6ba1f34532a86bea81d9a1262abc8c930c01f96b Parents: 572ebd1 Author: Varun Saxena <[email protected]> Authored: Sun Oct 15 01:25:32 2017 +0530 Committer: Varun Saxena <[email protected]> Committed: Tue Oct 17 23:36:41 2017 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ba1f345/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd index 48e3199..8415163 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd @@ -246,16 +246,15 @@ goto :eof ) goto :eof -<<<<<<< HEAD :router set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\router-config\log4j.properties set CLASS=org.apache.hadoop.yarn.server.router.Router set YARN_OPTS=%YARN_OPTS% %HADOOP_ROUTER_OPTS% -======= + goto :eof + :timelinereader set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties set CLASS=org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer ->>>>>>> YARN-5355. Backported YARN-2928 into our branch-2 feature branch. goto :eof :nodemanager --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
