svn commit: r896551 - in /hadoop/zookeeper/trunk: CHANGES.txt build.xml

[br...@apache.org]

Author: breed
Date: Wed Jan  6 17:23:06 2010
New Revision: 896551

URL: http://svn.apache.org/viewvc?rev=896551&view=rev
Log:
ZOOKEEPER-637. Trunk build is failing.

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=896551&r1=896550&r2=896551&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Jan  6 17:23:06 2010
@@ -190,6 +190,8 @@
   ZOOKEEPER-596. The last logged zxid calculated by zookeeper servers could
   cause problems in leader election if data gets corrupted. (mahadev)
 
+  ZOOKEEPER-637. Trunk build is failing (fpj via breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

Modified: hadoop/zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=896551&r1=896550&r2=896551&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Wed Jan  6 17:23:06 2010
@@ -279,7 +279,8 @@
       <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 -->
-      <property name="ivy.initialized" value="true"/>
+      <!-- we need to make sure ivy:settings is run. the initialized flag seems to break it -->
+      <!-- <property name="ivy.initialized" value="true"/> -->
       <ivy:settings id="${ant.project.name}" file="${ivysettings.xml}"/>
     </target>