Author: cos
Date: Thu Sep 2 05:46:07 2010
New Revision: 991820
URL: http://svn.apache.org/viewvc?rev=991820&view=rev
Log:
MAPREDUCE-1897. svn merge -c 991818 from trunk
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/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/examples/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/java/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml
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 Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk:940364,942764,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/.gitignore:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=991820&r1=991819&r2=991820&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu Sep 2 05:46:07 2010
@@ -1517,3 +1517,5 @@ Release 0.21.0 - 2010-08-13
MAPREDUCE-1856. Extract a subset of tests for smoke (DOA) validation (cos)
+ MAPREDUCE-1897. trunk build broken on compile-mapred-test (cos)
+
Propchange: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/CHANGES.txt:940364,942764,946526,952460,956336-956668,958279,964930,964932,964934,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/conf:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange:
hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/c++:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/build.xml:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/data_join:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/index:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/mrunit:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/streaming:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/contrib/vaidya:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/examples:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange: hadoop/mapreduce/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/java:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml?rev=991820&r1=991819&r2=991820&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml Thu Sep 2
05:46:07 2010
@@ -109,11 +109,11 @@
<pathelement location="${hadoop.conf.dir.deployed}" />
<pathelement location="${system-test-build-dir}/test/extraconf" />
<pathelement location="${system-test-build-dir}/test/classes" />
- <pathelement location="${build-fi.dir}/test/mapred/classes"/>
<pathelement location="${system-test-build-dir}/classes" />
+ <pathelement location="${system-test-build-dir}/test/mapred/classes"/>
+ <pathelement location="${system-test-build-dir}/tools" />
+ <pathelement location="${system-test-build-dir}" />
<pathelement location="${test.src.dir}" />
- <pathelement location="${build-fi.dir}" />
- <pathelement location="${build-fi.dir}/tools" />
<pathelement path="${clover.jar}" />
<fileset dir="${system-test-build-dir}">
<include name="**/*.jar" />
@@ -126,10 +126,10 @@
<pathelement location="${system-test-build-dir}/test/extraconf" />
<pathelement location="${system-test-build-dir}/test/classes" />
<pathelement location="${system-test-build-dir}/classes" />
- <pathelement location="${build-fi.dir}/test/mapred/classes" />
- <pathelement location="${build-fi.dir}/test/mapred/testjar" />
- <pathelement location="${build-fi.dir}/tools" />
- <pathelement location="${build-fi.dir}/examples" />
+ <pathelement location="${system-test-build-dir}/test/mapred/classes" />
+ <pathelement location="${system-test-build-dir}/test/mapred/testjar" />
+ <pathelement location="${system-test-build-dir}/tools" />
+ <pathelement location="${system-test-build-dir}/examples" />
<path refid="ivy-system.classpath"/>
</path>
@@ -208,10 +208,11 @@
<attribute name="dest.dir" />
<attribute name="src.dir" />
<attribute name="aspects.jars"/>
+ <attribute name="base.build.dir" default="${build-fi.dir}"/>
<sequential>
<subant buildpath="build.xml" target="-compile-fault-inject"
output="${compile-inject.output}">
- <property name="build.dir" value="${build-fi.dir}" />
+ <property name="build.dir" value="@{base.build.dir}" />
<property name="src.dir.path" value="@{src.dir}" />
<property name="dest.dir" value="@{dest.dir}" />
<property name="hadoop.instrumented.jars" value="@{aspects.jars}"/>
@@ -221,15 +222,15 @@
<target name="inject-system-faults"
description="Inject system faults">
- <property name="build-fi.dir" value="${system-test-build-dir}" />
- <mkdir dir="${build-fi.dir}"/>
+ <mkdir dir="${system-test-build-dir}"/>
<delete file="${compile-inject.output}"/>
<subant buildpath="build.xml" target="ivy-retrieve-system">
- <property name="build.dir" value="${build-fi.dir}"/>
+ <property name="build.dir" value="${system-test-build-dir}"/>
</subant>
<weave-injectfault-aspects dest.dir="${system-test-build-dir}/classes"
src.dir="${test.src.dir}/system/java;${test.src.dir}/system/aop"
-
aspects.jars="${build-fi.dir}/ivy/lib/${ant.project.name}/system/hadoop-common-${herriot.suffix}-${project.version}.jar">
+
aspects.jars="${system-test-build-dir}/ivy/lib/${ant.project.name}/system/hadoop-common-${herriot.suffix}-${project.version}.jar"
+ base.build.dir="${system-test-build-dir}">
</weave-injectfault-aspects>
</target>
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/test/mapred:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46: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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46: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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46: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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244
+/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
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46: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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244
+/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
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46: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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244
+/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
Propchange:
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46: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,940364,946526,956336-956668,958279,964930,964932,964934,986171,987244
+/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
Propchange: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 2 05:46:07 2010
@@ -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
+/hadoop/mapreduce/trunk/src/webapps/job:940364,946526,956336-956668,958279,964930,964932,964934,986171,987244,991818
