You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by gk...@apache.org on 2009/11/19 06:46:19 UTC
svn commit: r882051 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt
build.xml src/contrib/build.xml
Author: gkesavan
Date: Thu Nov 19 05:45:58 2009
New Revision: 882051
URL: http://svn.apache.org/viewvc?rev=882051&view=rev
Log:
HDFS-646. Merge -r 818800:818801 from trunk to branch
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/hdfs/branches/branch-0.21/build.xml (contents, props changed)
hadoop/hdfs/branches/branch-0.21/src/contrib/build.xml (contents, props changed)
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=882051&r1=882050&r2=882051&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Thu Nov 19 05:45:58 2009
@@ -457,6 +457,9 @@
the file. (cos)
HDFS-706. Intermittent failures in TestFiHFlush. (cos)
+
+ HDFS-646. Fix test-patch failure by adding test-contrib ant target.
+ (gkesavan)
Release 0.20.2 - Unreleased
Propchange: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Nov 19 05:45:58 2009
@@ -0,0 +1,3 @@
+/hadoop/core/branches/branch-0.19/hdfs/CHANGES.txt:713112
+/hadoop/hdfs/branches/HDFS-265/CHANGES.txt:796829-820463
+/hadoop/hdfs/trunk/CHANGES.txt:817853-817863,818294-818298,818801,824552,824944,826149,828116,828926,829880,829894,830003,831436,832043,833499,835728,880971,881014,881017
Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=882051&r1=882050&r2=882051&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Thu Nov 19 05:45:58 2009
@@ -621,6 +621,15 @@
<fail unless="continueOnFailure">Tests failed!</fail>
</target>
+ <target name="test-contrib" depends="compile-hdfs-test" description="Run contrib unit tests">
+ <subant target="test">
+ <property name="version" value="${version}"/>
+ <property name="hadoop-version" value="${hadoop-core.version}"/>
+ <property name="clover.jar" value="${clover.jar}"/>
+ <fileset file="${contrib.dir}/build.xml"/>
+ </subant>
+ </target>
+
<target name="test-core" description="Run hdfs unit tests">
<delete file="${test.build.dir}/testsfailed"/>
<property name="continueOnFailure" value="true"/>
Propchange: hadoop/hdfs/branches/branch-0.21/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 19 05:45:58 2009
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs/build.xml:713112
/hadoop/core/trunk/build.xml:779102
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
-/hadoop/hdfs/trunk/build.xml:817853-817863,818294-818298,824552,824944,825229,826149,828116,828926,829258,829880,829894,830003,831436,832043,833499,835728,880971,881014,881017
+/hadoop/hdfs/trunk/build.xml:817853-817863,818294-818298,818801,824552,824944,825229,826149,828116,828926,829258,829880,829894,830003,831436,832043,833499,835728,880971,881014,881017
Modified: hadoop/hdfs/branches/branch-0.21/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/contrib/build.xml?rev=882051&r1=882050&r2=882051&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/src/contrib/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/src/contrib/build.xml Thu Nov 19 05:45:58 2009
@@ -47,10 +47,6 @@
<target name="test">
<subant target="test">
<fileset dir="." includes="hdfsproxy/build.xml"/>
- <fileset dir="." includes="streaming/build.xml"/>
- <fileset dir="." includes="fairscheduler/build.xml"/>
- <fileset dir="." includes="capacity-scheduler/build.xml"/>
- <fileset dir="." includes="mrunit/build.xml"/>
</subant>
</target>
Propchange: hadoop/hdfs/branches/branch-0.21/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Nov 19 05:45:58 2009
@@ -0,0 +1,3 @@
+/hadoop/core/branches/branch-0.19/hdfs/src/contrib/build.xml:713112
+/hadoop/hdfs/branches/HDFS-265/src/contrib/build.xml:796829-820463
+/hadoop/hdfs/trunk/src/contrib/build.xml:817853-817863,818294-818298,818801,824552,824944,826149,828116,828926,829880,829894,830003,831436,832043,833499,835728,880971,881014,881017