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

Merge -r 1370119:1370120 from trunk to branch. FIXES: MAPREDUCE-4484 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370121 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-08-07 05:16:15 +00:00
parent 6c4b4e19b3
commit 88593c443d
2 changed files with 5 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

@ -38,6 +38,9 @@ Branch-2 ( Unreleased changes )
MAPREDUCE-4494. TestFifoScheduler failing with Metrics source QueueMetrics,q0=default
already exists!. (ahmed.radwan via tucu)
MAPREDUCE-4484. Incorrect IS_MINI_YARN_CLUSTER property name in YarnConfiguration.
(ahmed.radwan via tucu)
Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES

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

@ -563,7 +563,8 @@ public class YarnConfiguration extends Configuration {
/** Container temp directory */
public static final String DEFAULT_CONTAINER_TEMP_DIR = "./tmp";
public static final String IS_MINI_YARN_CLUSTER = YARN_PREFIX + ".is.minicluster";
public static final String IS_MINI_YARN_CLUSTER = YARN_PREFIX
+ "is.minicluster";
/** Whether to use fixed ports with the minicluster. */
public static final String YARN_MINICLUSTER_FIXED_PORTS = YARN_PREFIX