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

MAPREDUCE-3242. Trunk compilation broken with bad interaction from MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev) - Merging r1187587 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187589 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mahadev Konar 2011-10-21 22:48:29 +00:00
parent 101dafff16
commit abae89ed32
2 changed files with 6 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

@ -1670,6 +1670,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3070. Fix NodeManager to use ephemeral ports by default. MAPREDUCE-3070. Fix NodeManager to use ephemeral ports by default.
(Devaraj K via acmurthy) (Devaraj K via acmurthy)
MAPREDUCE-3242. Trunk compilation broken with bad interaction from
MAPREDUCE-3070 and MAPREDUCE-3239. (mahadev)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
View File

@ -227,7 +227,9 @@ public class YarnConfiguration extends Configuration {
/** address of node manager IPC.*/ /** address of node manager IPC.*/
public static final String NM_ADDRESS = NM_PREFIX + "address"; 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.*/ /** who will execute(launch) the containers.*/
public static final String NM_CONTAINER_EXECUTOR = public static final String NM_CONTAINER_EXECUTOR =