You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ma...@apache.org on 2011/10/22 00:48:30 UTC
svn commit: r1187589 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Author: mahadev
Date: Fri Oct 21 22:48:29 2011
New Revision: 1187589
URL: http://svn.apache.org/viewvc?rev=1187589&view=rev
Log:
MAPREDUCE-3242. Trunk compilation broken with bad interaction from MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev) - Merging r1187587 from trunk
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1187589&r1=1187588&r2=1187589&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri Oct 21 22:48:29 2011
@@ -1670,6 +1670,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3070. Fix NodeManager to use ephemeral ports by default.
(Devaraj K via acmurthy)
+ MAPREDUCE-3242. Trunk compilation broken with bad interaction from
+ MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1187589&r1=1187588&r2=1187589&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java Fri Oct 21 22:48:29 2011
@@ -227,7 +227,9 @@ public class YarnConfiguration extends C
/** address of node manager IPC.*/
public static final String NM_ADDRESS = NM_PREFIX + "address";
- public static final String DEFAULT_NM_ADDRESS = "0.0.0.0:0";
+ public static final int DEFAULT_NM_PORT = 0;
+ public static final String DEFAULT_NM_ADDRESS = "0.0.0.0:"
+ + DEFAULT_NM_PORT;
/** who will execute(launch) the containers.*/
public static final String NM_CONTAINER_EXECUTOR =