Author: cos
Date: Fri Nov 19 23:24:07 2010
New Revision: 1037080
URL: http://svn.apache.org/viewvc?rev=1037080&view=rev
Log:
MAPREDUCE-2195. svn merge -c 1037075 from trunk
Modified:
hadoop/mapreduce/branches/branch-0.22/ (props changed)
hadoop/mapreduce/branches/branch-0.22/.gitignore (props changed)
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (contents, props
changed)
hadoop/mapreduce/branches/branch-0.22/conf/ (props changed)
hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/c++/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/index/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/examples/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/java/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/system/conf/system-test-mapred.xml
hadoop/mapreduce/branches/branch-0.22/src/webapps/job/ (props changed)
Propchange: hadoop/mapreduce/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1 +1,2 @@
/hadoop/core/branches/branch-0.19/mapred:713112
+/hadoop/mapreduce/trunk:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
/hadoop/core/trunk/.gitignore:784664-785643
+/hadoop/mapreduce/trunk/.gitignore:1037075
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1037080&r1=1037079&r2=1037080&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Fri Nov 19 23:24:07 2010
@@ -401,6 +401,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
Propchange: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
+/hadoop/mapreduce/trunk/CHANGES.txt:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf:713112
/hadoop/core/trunk/conf:784664-785643
+/hadoop/mapreduce/trunk/conf:1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
/hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
+/hadoop/mapreduce/trunk/src/c++:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
+/hadoop/mapreduce/trunk/src/contrib:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1 +1,2 @@
/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
/hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
/hadoop/core/trunk/src/contrib/build.xml:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/build.xml:1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
/hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
/hadoop/core/trunk/src/contrib/data_join:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/data_join:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
/hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
/hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
/hadoop/core/trunk/src/contrib/index:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/index:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
/hadoop/core/trunk/src/contrib/mrunit:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/mrunit:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
/hadoop/core/trunk/src/contrib/streaming:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/streaming:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
/hadoop/core/trunk/src/contrib/vaidya:776175-786373
+/hadoop/mapreduce/trunk/src/contrib/vaidya:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
+/hadoop/mapreduce/trunk/src/examples:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
+/hadoop/mapreduce/trunk/src/java:1037075
Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
/hadoop/core/trunk/src/test/mapred:776175-785643
+/hadoop/mapreduce/trunk/src/test/mapred:1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,1037075
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,1037075
Modified:
hadoop/mapreduce/branches/branch-0.22/src/test/system/conf/system-test-mapred.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/test/system/conf/system-test-mapred.xml?rev=1037080&r1=1037079&r2=1037080&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/test/system/conf/system-test-mapred.xml
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/test/system/conf/system-test-mapred.xml
Fri Nov 19 23:24:07 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. -->
Propchange: hadoop/mapreduce/branches/branch-0.22/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 19 23:24:07 2010
@@ -1,2 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
/hadoop/core/trunk/src/webapps/job:776175-785643
+/hadoop/mapreduce/trunk/src/webapps/job:1037075
