Author: tucu
Date: Tue Aug 7 05:16:15 2012
New Revision: 1370121
URL: http://svn.apache.org/viewvc?rev=1370121&view=rev
Log:
Merge -r 1370119:1370120 from trunk to branch. FIXES: MAPREDUCE-4484
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/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
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=1370121&r1=1370120&r2=1370121&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue
Aug 7 05:16:15 2012
@@ -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
Modified:
hadoop/common/branches/branch-2/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-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1370121&r1=1370120&r2=1370121&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Tue Aug 7 05:16:15 2012
@@ -563,7 +563,8 @@ public class YarnConfiguration extends C
/** 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
