Author: harsh
Date: Mon Oct 1 17:10:11 2012
New Revision: 1392446
URL: http://svn.apache.org/viewvc?rev=1392446&view=rev
Log:
MAPREDUCE-4695. Fix LocalRunner on trunk after MAPREDUCE-3223 broke it.
Contributed by Harsh J. (harsh)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1392446&r1=1392445&r2=1392446&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Oct 1
17:10:11 2012
@@ -135,6 +135,9 @@ Trunk (Unreleased)
MAPREDUCE-4678. Running the Pentomino example with defaults throws
java.lang.NegativeArraySizeException (Chris McConnell via harsh)
+ MAPREDUCE-4695. Fix LocalRunner on trunk after MAPREDUCE-3223 broke it
+ (harsh)
+
Release 2.0.3-alpha - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1392446&r1=1392445&r2=1392446&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Mon Oct 1 17:10:11 2012
@@ -644,6 +644,17 @@
</property>
<property>
+ <name>mapreduce.cluster.local.dir</name>
+ <value>${hadoop.tmp.dir}/mapred/local</value>
+ <description>
+ The local directory where MapReduce stores intermediate
+ data files. May be a comma-separated list of
+ directories on different devices in order to spread disk i/o.
+ Directories that do not exist are ignored.
+ </description>
+</property>
+
+<property>
<name>mapreduce.cluster.acls.enabled</name>
<value>false</value>
<description> Specifies whether ACLs should be checked
