Author: cnauroth
Date: Thu Jan 9 23:22:01 2014
New Revision: 1556981
URL: http://svn.apache.org/r1556981
Log:
YARN-1138. Merging change r1556979 from branch-2 to branch-2.3
Modified:
hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Modified: hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt?rev=1556981&r1=1556980&r2=1556981&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.3/hadoop-yarn-project/CHANGES.txt Thu Jan
9 23:22:01 2014
@@ -86,6 +86,9 @@ Release 2.3.0 - UNRELEASED
YARN-1438. Ensure container diagnostics includes exception from container
launch. (stevel via acmurthy)
+ YARN-1138. yarn.application.classpath is set to point to $HADOOP_CONF_DIR
+ etc., which does not work on Windows. (Chuan Liu via cnauroth)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1556981&r1=1556980&r2=1556981&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Thu Jan 9 23:22:01 2014
@@ -767,10 +767,29 @@
<!-- Applications' Configuration-->
<property>
- <description>CLASSPATH for YARN applications. A comma-separated list
- of CLASSPATH entries</description>
- <name>yarn.application.classpath</name>
-
<value>$HADOOP_CONF_DIR,$HADOOP_COMMON_HOME/share/hadoop/common/*,$HADOOP_COMMON_HOME/share/hadoop/common/lib/*,$HADOOP_HDFS_HOME/share/hadoop/hdfs/*,$HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/*,$HADOOP_YARN_HOME/share/hadoop/yarn/*,$HADOOP_YARN_HOME/share/hadoop/yarn/lib/*</value>
+ <description>
+ CLASSPATH for YARN applications. A comma-separated list
+ of CLASSPATH entries. When this value is empty, the following default
+ CLASSPATH for YARN applications would be used.
+ For Linux:
+ $HADOOP_CONF_DIR,
+ $HADOOP_COMMON_HOME/share/hadoop/common/*,
+ $HADOOP_COMMON_HOME/share/hadoop/common/lib/*,
+ $HADOOP_HDFS_HOME/share/hadoop/hdfs/*,
+ $HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/*,
+ $HADOOP_YARN_HOME/share/hadoop/yarn/*,
+ $HADOOP_YARN_HOME/share/hadoop/yarn/lib/*
+ For Windows:
+ %HADOOP_CONF_DIR%,
+ %HADOOP_COMMON_HOME%/share/hadoop/common/*,
+ %HADOOP_COMMON_HOME%/share/hadoop/common/lib/*,
+ %HADOOP_HDFS_HOME%/share/hadoop/hdfs/*,
+ %HADOOP_HDFS_HOME%/share/hadoop/hdfs/lib/*,
+ %HADOOP_YARN_HOME%/share/hadoop/yarn/*,
+ %HADOOP_YARN_HOME%/share/hadoop/yarn/lib/*
+ </description>
+ <name>yarn.application.classpath</name>
+ <value></value>
</property>
<!-- Other configuration -->
