Author: tucu Date: Tue Jul 24 22:09:04 2012 New Revision: 1365323 URL: http://svn.apache.org/viewvc?rev=1365323&view=rev Log: Merge -r 1365321:1365322 from trunk to branch. FIXES: MAPREDUCE-4465
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1365323&r1=1365322&r2=1365323&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue Jul 24 22:09:04 2012 @@ -25,6 +25,9 @@ Branch-2 ( Unreleased changes ) MAPREDUCE-4407. Add hadoop-yarn-server-tests-<version>-tests.jar to hadoop dist package. (ahmed via tucu) + MAPREDUCE-4465. Update description of yarn.nodemanager.address property. + (bowang via tucu) + Release 2.1.0-alpha - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1365323&r1=1365322&r2=1365323&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml Tue Jul 24 22:09:04 2012 @@ -241,7 +241,7 @@ <!-- Node Manager Configs --> <property> - <description>address of node manager IPC.</description> + <description>The address of the container manager in the NM.</description> <name>yarn.nodemanager.address</name> <value>0.0.0.0:0</value> </property>