You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by co...@apache.org on 2011/01/04 03:57:24 UTC
svn commit: r1054875 - in /hadoop/mapreduce/branches/branch-0.21: ./ conf/
src/c++/ src/contrib/ src/contrib/block_forensics/
src/contrib/capacity-scheduler/ src/contrib/data_join/
src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/ src/contrib/...
Author: cos
Date: Tue Jan 4 02:57:23 2011
New Revision: 1054875
URL: http://svn.apache.org/viewvc?rev=1054875&view=rev
Log:
MAPREDUCE-2228. svn merge -c 1054873 from trunk and fixing svn:externals for src/test/bin
Modified:
hadoop/mapreduce/branches/branch-0.21/ (props changed)
hadoop/mapreduce/branches/branch-0.21/.gitignore (props changed)
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/mapreduce/branches/branch-0.21/build-utils.xml
hadoop/mapreduce/branches/branch-0.21/build.xml
hadoop/mapreduce/branches/branch-0.21/conf/ (props changed)
hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template (props changed)
hadoop/mapreduce/branches/branch-0.21/src/c++/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/docs/forrest.properties
hadoop/mapreduce/branches/branch-0.21/src/examples/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/java/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/webapps/job/ (props changed)
Propchange: hadoop/mapreduce/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:940364,942764,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk:940364,942764,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
/hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/.gitignore:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=1054875&r1=1054874&r2=1054875&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Tue Jan 4 02:57:23 2011
@@ -37,6 +37,8 @@ Release 0.21.1 - Unreleased
MAPREDUCE-2223. TestMRCLI might fail on Ubuntu with default /etc/hosts
(cos)
+ MAPREDUCE-2228. Remove java5 dependencies from build. (cos)
+
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
Propchange: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,942764,946526,952460,956336-956668,958279,964930,964932,964934,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/CHANGES.txt:940364,942764,946526,952460,956336-956668,958279,964930,964932,964934,987244,991818,1001583,1004113,1026158,1052106,1054873
Modified: hadoop/mapreduce/branches/branch-0.21/build-utils.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/build-utils.xml?rev=1054875&r1=1054874&r2=1054875&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/build-utils.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/build-utils.xml Tue Jan 4 02:57:23 2011
@@ -26,11 +26,7 @@ Contains utilities that are common for t
<dirname property="build-utils.basedir" file="${ant.file.build-utils}"/>
<property file="${build-utils.basedir}/build.properties"/>
- <target name="java5.check" unless="java5.home">
- <fail message="'java5.home' is not defined. Forrest requires Java 5. Please pass -Djava5.home=<base of Java 5 distribution> to Ant on the command-line, or set java5.home in build properties file." />
- </target>
-
- <target name="forrest.check" unless="forrest.home" depends="java5.check">
+ <target name="forrest.check" unless="forrest.home">
<fail message="'forrest.home' is not defined. Please pass -Dforrest.home=<base of Apache Forrest installation> to Ant on the command-line, or set forest.home in build properties file." />
</target>
Modified: hadoop/mapreduce/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/build.xml?rev=1054875&r1=1054874&r2=1054875&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/build.xml Tue Jan 4 02:57:23 2011
@@ -912,7 +912,6 @@
tofile="${build.docs}/mapred-queues.xml" failonerror="false"/>
<exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
failonerror="true">
- <env key="JAVA_HOME" value="${java5.home}"/>
</exec>
<copy todir="${build.docs}">
<fileset dir="${docs.src}/build/site/" />
@@ -1740,7 +1739,6 @@
<arg value="${findbugs.home}"/>
<arg value="${forrest.home}"/>
<arg value="${basedir}"/>
- <arg value="${java5.home}"/>
</exec>
</target>
@@ -1763,7 +1761,6 @@
<arg value="${basedir}"/>
<arg value="${trigger.url}"/>
<arg value="${jira.passwd}"/>
- <arg value="${java5.home}"/>
<arg value="${curl.cmd}"/>
<arg value="${defect}"/>
</exec>
Propchange: hadoop/mapreduce/branches/branch-0.21/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf:713112
/hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/conf:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/c++:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
-/hadoop/mapreduce/trunk/src/contrib/block_forensics:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/build.xml:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/data_join:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/index:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/mrunit:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/streaming:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/contrib/vaidya:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Modified: hadoop/mapreduce/branches/branch-0.21/src/docs/forrest.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/docs/forrest.properties?rev=1054875&r1=1054874&r2=1054875&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/docs/forrest.properties (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/docs/forrest.properties Tue Jan 4 02:57:23 2011
@@ -71,10 +71,13 @@
#forrest.validate=true
#forrest.validate.xdocs=${forrest.validate}
#forrest.validate.skinconf=${forrest.validate}
-#forrest.validate.sitemap=${forrest.validate}
-#forrest.validate.stylesheets=${forrest.validate}
+# Workaround (HADOOP-7072) for http://issues.apache.org/jira/browse/FOR-984
+# Remove when forrest-0.9 is available
+forrest.validate.sitemap=false
+forrest.validate.stylesheets=false
+# End of forrest-0.8 + JDK6 workaround
#forrest.validate.skins=${forrest.validate}
-#forrest.validate.skins.stylesheets=${forrest.validate.skins}
+forrest.validate.skins.stylesheets=false
# *.failonerror=(true|false) - stop when an XML file is invalid
#forrest.validate.failonerror=true
Propchange: hadoop/mapreduce/branches/branch-0.21/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
-/hadoop/mapreduce/trunk/src/examples:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/examples:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/java:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/java:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Jan 4 02:57:23 2011
@@ -1 +1 @@
-bin https://svn.apache.org/repos/asf/hadoop/common/trunk/src/test/bin
+bin https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21/src/test/bin
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,4 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873
Propchange: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 4 02:57:23 2011
@@ -1,3 +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:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106
+/hadoop/mapreduce/trunk/src/webapps/job:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818,1001583,1004113,1026158,1052106,1054873