Author: cnauroth
Date: Mon Oct 28 17:52:24 2013
New Revision: 1536446
URL: http://svn.apache.org/r1536446
Log:
YARN-1349. Merging change r1536445 from branch-2 to branch-2.2
Modified:
hadoop/common/branches/branch-2.2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Modified: hadoop/common/branches/branch-2.2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-yarn-project/CHANGES.txt?rev=1536446&r1=1536445&r2=1536446&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.2/hadoop-yarn-project/CHANGES.txt Mon Oct
28 17:52:24 2013
@@ -55,6 +55,9 @@ Release 2.2.1 - UNRELEASED
(Sandy Ryza)
YARN-1022. Unnecessary INFO logs in AMRMClientAsync (haosdent via bikas)
+
+ YARN-1349. yarn.cmd does not support passthrough to any arbitrary class.
+ (cnauroth)
Release 2.2.0 - 2013-10-13
Modified:
hadoop/common/branches/branch-2.2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd?rev=1536446&r1=1536445&r2=1536446&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Mon Oct 28 17:52:24 2013
@@ -133,7 +133,21 @@ if "%1" == "--config" (
set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_DIR%\*
set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\*
- call :%yarn-command% %yarn-command-arguments%
+ if %yarn-command% == classpath (
+ @echo %CLASSPATH%
+ goto :eof
+ )
+
+ set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar
application node logs daemonlog
+ for %%i in ( %yarncommands% ) do (
+ if %yarn-command% == %%i set yarncommand=true
+ )
+ if defined yarncommand (
+ call :%yarn-command%
+ ) else (
+ set CLASSPATH=%CLASSPATH%;%CD%
+ set CLASS=%yarn-command%
+ )
if defined JAVA_LIBRARY_PATH (
set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH%
