From 7137503eb7f0b7c5a89a3a272e0bd7015ee4c15e Mon Sep 17 00:00:00 2001 From: Harsh J Date: Mon, 1 Oct 2012 17:10:11 +0000 Subject: [PATCH] MAPREDUCE-4695. Fix LocalRunner on trunk after MAPREDUCE-3223 broke it. Contributed by Harsh J. (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1392446 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/mapred-default.xml | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c221f12eaba..2125505bb51 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -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 diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index 447ac34c0b8..92aeba6ad8e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -643,6 +643,17 @@ + + mapreduce.cluster.local.dir + ${hadoop.tmp.dir}/mapred/local + + 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. + + + mapreduce.cluster.acls.enabled false