MAPREDUCE-2195. New property for local conf directory in system-test-mapreduce.xml file. Contributed by Konstantin Boudnik.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1037075 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index c28bd89..e973660 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -415,6 +415,9 @@
     MAPREDUCE-2034. TestSubmitJob triggers NPE instead of permissions error.
     (Todd Lipcon via tomwhite)
 
+    MAPREDUCE-2195. New property for local conf directory in
+    system-test-mapreduce.xml file. (cos)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES
diff --git a/src/test/system/conf/system-test-mapred.xml b/src/test/system/conf/system-test-mapred.xml
index ae71262..61f6cfb 100644
--- a/src/test/system/conf/system-test-mapred.xml
+++ b/src/test/system/conf/system-test-mapred.xml
@@ -70,6 +70,14 @@
   Command for resuming the given suspended process.
   </description>
 </property>
+<property>
+  <name>test.system.hdrc.hadoop.local.confdir</name>
+  <value>$(TO_DO_GLOBAL_TMP_DIR)/localconf</value>
+  <description>
+    A local directory where a new config file is placed before
+    being pushed into new config location on the cluster.
+  </description>
+</property>
 
 <!-- Mandatory keys to be set for the multi user support to be enabled.  -->