Return-Path: 
 <mapreduce-commits-return-1248-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 14464 invoked from network); 15 Feb 2011 21:11:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 15 Feb 2011 21:11:11 -0000
Received: (qmail 88838 invoked by uid 500); 15 Feb 2011 21:11:11 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 88779 invoked by uid 500); 15 Feb 2011 21:11:11 -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 88771 invoked by uid 99); 15 Feb 2011 21:11:11 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Feb 2011 21:11:11 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 15 Feb 2011 21:11:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6E80023888D2; Tue, 15 Feb 2011 21:10:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1071065 - in /hadoop/mapreduce/branches/branch-0.22: ./
 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/...
Date: Tue, 15 Feb 2011 21:10:48 -0000
To: mapreduce-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110215211048.6E80023888D2@eris.apache.org>

Author: cos
Date: Tue Feb 15 21:10:47 2011
New Revision: 1071065

URL: http://svn.apache.org/viewvc?rev=1071065&view=rev
Log:
MAPREDUCE-2314. svn merge -c 1071054 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/build.xml
    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/webapps/job/   (props changed)

Propchange: hadoop/mapreduce/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 2011
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
 /hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/.gitignore:1037075,1052106,1053730,1054873,1065861,1071054

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1071065&r1=1071064&r2=1071065&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Tue Feb 15 21:10:47 2011
@@ -182,6 +182,9 @@ Release 0.22.0 - Unreleased
 
     MAPREDUCE-2260. Remove auto-generated native build files. (rvs via eli)
 
+    MAPREDUCE-2314. configure files that are generated as part of the released
+    tarball need to have executable bit set (rvs via cos)
+
   OPTIMIZATIONS
     
     MAPREDUCE-1354. Enhancements to JobTracker for better performance and

Propchange: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1057495,1065861
+/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873,1057495,1065861,1071054

Modified: hadoop/mapreduce/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/build.xml?rev=1071065&r1=1071064&r2=1071065&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/build.xml Tue Feb 15 21:10:47 2011
@@ -1208,6 +1208,12 @@
     <copy todir="${dist.dir}/" file="build-utils.xml"/>
 
     <chmod perm="ugo+x" type="file" parallel="false">
+        <fileset file="${dist.dir}/src/examples/pipes/configure"/>
+        <fileset file="${dist.dir}/src/c++/utils/configure"/>
+        <fileset file="${dist.dir}/src/c++/pipes/configure"/>
+        <fileset file="${dist.dir}/src/c++/task-controller/configure"/>
+    </chmod>
+    <chmod perm="ugo+x" type="file" parallel="false">
         <fileset dir="${dist.dir}/bin"/>
         <fileset dir="${dist.dir}/src/contrib/">
           <include name="*/bin/*" />
@@ -1228,11 +1234,19 @@
         <tarfileset dir="${build.dir}" mode="664">
           <exclude name="${final.name}/bin/*" />
           <exclude name="${final.name}/contrib/*/bin/*" />
+          <exclude name="${final.name}/src/examples/pipes/configure"/>
+          <exclude name="${final.name}/src/c++/utils/configure"/>
+          <exclude name="${final.name}/src/c++/pipes/configure"/>
+          <exclude name="${final.name}/src/c++/task-controller/configure"/>
           <include name="${final.name}/**" />
         </tarfileset>
         <tarfileset dir="${build.dir}" mode="755">
           <include name="${final.name}/bin/*" />
           <include name="${final.name}/contrib/*/bin/*" />
+          <include name="${final.name}/src/examples/pipes/configure"/>
+          <include name="${final.name}/src/c++/utils/configure"/>
+          <include name="${final.name}/src/c++/pipes/configure"/>
+          <include name="${final.name}/src/c++/task-controller/configure"/>
         </tarfileset>
       </param.listofitems>
     </macro_tar>

Propchange: hadoop/mapreduce/branches/branch-0.22/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 2011
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf:713112
 /hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/conf:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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++:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/c++:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 2011
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
-/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/build.xml:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/data_join:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/index:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/mrunit:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/streaming:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/contrib/vaidya:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/examples:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/java:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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,1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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,1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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,1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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,1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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,1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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,1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054

Propchange: hadoop/mapreduce/branches/branch-0.22/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 21:10:47 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:1037075,1052106,1053730,1054873,1065861
+/hadoop/mapreduce/trunk/src/webapps/job:1037075,1052106,1053730,1054873,1065861,1071054