MAPREDUCE-2379. Adds missing DistributedCache configurations in mapred-default.xml. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1081280 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 455b111..dae0792 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -115,6 +115,9 @@
     MAPREDUCE-1242. Chain APIs error misleading.
     (Harsh J Chouraria via tomwhite)
 
+    MAPREDUCE-2379. Adds missing DistributedCache configurations in 
+    mapred-default.xml (Todd Lipcon via amareshwari)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/java/mapred-default.xml b/src/java/mapred-default.xml
index f47b07b..d76ca04 100644
--- a/src/java/mapred-default.xml
+++ b/src/java/mapred-default.xml
@@ -1011,6 +1011,26 @@
   </description>
 </property>
 
+<!-- TaskTracker DistributedCache configuration -->
+<property>
+  <name>mapreduce.tasktracker.cache.local.size</name>
+  <value>10737418240</value>
+  <description>The number of bytes to allocate in each local TaskTracker
+  directory for holding Distributed Cache data.</description>
+</property>
+
+<property>
+  <name>mapreduce.tasktracker.cache.local.numberdirectories</name>
+  <value>10000</value>
+  <description>
+  The maximum number of subdirectories that should be created in any particular
+  distributed cache store. After this many directories have been created,
+  cache items will be expunged regardless of whether the total size threshold
+  has been exceeded.
+  </description>
+</property>
+<!-- End of TaskTracker DistributedCache configuration -->
+
 <property>
   <name>mapreduce.task.merge.progress.records</name>
   <value>10000</value>