Return-Path: 
 <hdfs-commits-return-1003-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: (qmail 92002 invoked from network); 21 Dec 2010 00:22:27 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 21 Dec 2010 00:22:27 -0000
Received: (qmail 99827 invoked by uid 500); 21 Dec 2010 00:22:27 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 99738 invoked by uid 500); 21 Dec 2010 00:22:27 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 99730 invoked by uid 99); 21 Dec 2010 00:22:27 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Dec 2010 00:22:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 21 Dec 2010 00:22:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CF1F623888CF; Tue, 21 Dec 2010 00:22:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1051333 [1/2] - in /hadoop/hdfs/trunk: CHANGES.txt
 build.xml
 src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
Date: Tue, 21 Dec 2010 00:22:03 -0000
To: hdfs-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101221002203.CF1F623888CF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cos
Date: Tue Dec 21 00:22:03 2010
New Revision: 1051333

URL: http://svn.apache.org/viewvc?rev=1051333&view=rev
Log:
HDFS-1406. Reverting previous commit because a wrong file got committed along the line.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml
    hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1051333&r1=1051332&r2=1051333&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Dec 21 00:22:03 2010
@@ -1429,8 +1429,6 @@ Release 0.20.3 - Unreleased
     HDFS-132. Fix namenode to not report files deleted metrics for deletions
     done while replaying edits during startup. (suresh & shv)
 
-    HDFS-1406. TestCLI fails on Ubuntu with default /etc/hosts. (cos)
-
 Release 0.20.2 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1051333&r1=1051332&r2=1051333&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Tue Dec 21 00:22:03 2010
@@ -719,12 +719,12 @@
     <property name="continueOnFailure" value="true"/>
     <antcall target="run-test-hdfs"/>
     <antcall target="run-test-unit"/>
+    <antcall target="run-test-hdfs-fault-inject"/>
     <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
     <fail if="testsfailed">Tests failed!</fail>
   </target>
 
   <target name="test" depends="test-c++-libhdfs, jar-test, test-core" description="Run all unit tests">
-    <antcall target="run-test-hdfs-fault-inject"/>
     <subant target="test-contrib">
       <fileset file="${basedir}/build.xml"/>
      </subant>
@@ -1516,7 +1516,7 @@
          uri="urn:maven-artifact-ant" classpathref="mvn-ant-task.classpath"/>
   </target>   
 
-  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version"
+  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
      description="To install hadoop hdfs and test jars to local filesystem's m2 cache">
      <artifact:pom file="${hadoop-hdfs.pom}" id="hadoop.hdfs"/>
      <artifact:pom file="${hadoop-hdfs-test.pom}" id="hadoop.hdfs.test"/>
@@ -1529,9 +1529,6 @@
         <attach file="${hadoop-hdfs-test-sources.jar}" classifier="sources" />
      </artifact:install>
    </target>
-
-   <target name="mvn-si-install" depends="mvn-install,-mvn-system-install"
-           description="Install system integration tests jars as well"/>
   
    <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test,
      jar-system, jar-test-system, set-version, signanddeploy, simpledeploy"