Return-Path: 
 <mapreduce-commits-return-1145-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 44155 invoked from network); 19 Nov 2010 22:57:30 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 19 Nov 2010 22:57:30 -0000
Received: (qmail 63784 invoked by uid 500); 19 Nov 2010 22:58:01 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 63738 invoked by uid 500); 19 Nov 2010 22:58:00 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 63730 invoked by uid 99); 19 Nov 2010 22:58:00 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Nov 2010 22:58:00 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Nov 2010 22:57:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C9E0C23888E4; Fri, 19 Nov 2010 22:56:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1037075 - in /hadoop/mapreduce/trunk: CHANGES.txt
 src/test/system/conf/system-test-mapred.xml
Date: Fri, 19 Nov 2010 22:56:43 -0000
To: mapreduce-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101119225643.C9E0C23888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cos
Date: Fri Nov 19 22:56:43 2010
New Revision: 1037075

URL: http://svn.apache.org/viewvc?rev=1037075&view=rev
Log:
MAPREDUCE-2195. New property for local conf directory in system-test-mapreduce.xml file. Contributed by Konstantin Boudnik.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/test/system/conf/system-test-mapred.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1037075&r1=1037074&r2=1037075&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Nov 19 22:56:43 2010
@@ -415,6 +415,9 @@ Release 0.22.0 - Unreleased
     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

Modified: hadoop/mapreduce/trunk/src/test/system/conf/system-test-mapred.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/system/conf/system-test-mapred.xml?rev=1037075&r1=1037074&r2=1037075&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/system/conf/system-test-mapred.xml (original)
+++ hadoop/mapreduce/trunk/src/test/system/conf/system-test-mapred.xml Fri Nov 19 22:56:43 2010
@@ -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.  -->