Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1365321:1365322 from trunk to branch. FIXES: MAPREDUCE-4465 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365323 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-07-24 22:09:04 +00:00
parent dce4a7c765
commit 4ded6d2c01
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -25,6 +25,9 @@ Branch-2 ( Unreleased changes )
MAPREDUCE-4407. Add hadoop-yarn-server-tests-<version>-tests.jar to hadoop dist MAPREDUCE-4407. Add hadoop-yarn-server-tests-<version>-tests.jar to hadoop dist
package. (ahmed via tucu) package. (ahmed via tucu)
MAPREDUCE-4465. Update description of yarn.nodemanager.address property.
(bowang via tucu)
Release 2.1.0-alpha - Unreleased Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
View File

@ -241,7 +241,7 @@
<!-- Node Manager Configs --> <!-- Node Manager Configs -->
<property> <property>
<description>address of node manager IPC.</description> <description>The address of the container manager in the NM.</description>
<name>yarn.nodemanager.address</name> <name>yarn.nodemanager.address</name>
<value>0.0.0.0:0</value> <value>0.0.0.0:0</value>
</property> </property>