hadoop-zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f..@apache.org
Subject svn commit: r896800 - in /hadoop/zookeeper/trunk: CHANGES.txt build.xml
Date Thu, 07 Jan 2010 08:40:47 GMT
Author: fpj
Date: Thu Jan  7 08:40:28 2010
New Revision: 896800

URL: http://svn.apache.org/viewvc?rev=896800&view=rev
Log:
ZOOKEEPER-637. Trunk build is failing - second patch (breed via fpj)


Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/build.xml

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=896800&r1=896799&r2=896800&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Thu Jan  7 08:40:28 2010
@@ -191,6 +191,8 @@
   cause problems in leader election if data gets corrupted. (mahadev)
 
   ZOOKEEPER-637. Trunk build is failing (fpj via breed)
+  
+  ZOOKEEPER-637. Trunk build is failing - second patch (breed via fpj)
 
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to

Modified: hadoop/zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=896800&r1=896799&r2=896800&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Thu Jan  7 08:40:28 2010
@@ -275,12 +275,14 @@
            dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
     </target>
 
-    <target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
+    <target name="ivy-taskdef" unless="ivy.initialized">
       <taskdef resource="org/apache/ivy/ant/antlib.xml"
                uri="antlib:org.apache.ivy.ant" classpathref="java.classpath"/>
       <!-- ensure that ivy taskdef is only run once, otw ant will error -->
-      <!-- we need to make sure ivy:settings is run. the initialized flag seems to break
it -->
-      <!-- <property name="ivy.initialized" value="true"/> -->
+      <property name="ivy.initialized" value="true"/> 
+    </target>
+
+    <target name="ivy-init" depends="ivy-download,ivy-taskdef">
       <ivy:settings id="${ant.project.name}" file="${ivysettings.xml}"/>
     </target>
 



Mime
View raw message