Author: szetszwo
Date: Wed Nov 13 01:14:37 2013
New Revision: 1541342
URL: http://svn.apache.org/r1541342
Log:
merge r1535792 through r1541341 from trunk.
Modified:
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Modified: hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt?rev=1541342&r1=1541341&r2=1541342&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-yarn-project/CHANGES.txt Wed Nov 13
01:14:37 2013
@@ -124,6 +124,9 @@ Release 2.3.0 - UNRELEASED
YARN-1395. Distributed shell application master launched with debug flag
can
hang waiting for external ls process. (cnauroth)
+ YARN-1400. yarn.cmd uses HADOOP_RESOURCEMANAGER_OPTS. Should be
+ YARN_RESOURCEMANAGER_OPTS. (Raja Aluri via cnauroth)
+
Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd?rev=1541342&r1=1541341&r2=1541342&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
(original)
+++
hadoop/common/branches/HDFS-2832/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Wed Nov 13 01:14:37 2013
@@ -180,7 +180,7 @@ goto :eof
:resourcemanager
set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\rm-config\log4j.properties
set CLASS=org.apache.hadoop.yarn.server.resourcemanager.ResourceManager
- set YARN_OPTS=%YARN_OPTS% %HADOOP_RESOURCEMANAGER_OPTS%
+ set YARN_OPTS=%YARN_OPTS% %YARN_RESOURCEMANAGER_OPTS%
if defined YARN_RESOURCEMANAGER_HEAPSIZE (
set JAVA_HEAP_MAX=-Xmx%YARN_RESOURCEMANAGER_HEAPSIZE%m
)
