Bläddra i källkod

ZOOKEEPER-637. Trunk build is failing.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@896551 13f79535-47bb-0310-9956-ffa450edef68
Benjamin Reed 15 år sedan
förälder
incheckning
952e0f5508
2 ändrade filer med 4 tillägg och 1 borttagningar
  1. 2 0
      CHANGES.txt
  2. 2 1
      build.xml

+ 2 - 0
CHANGES.txt

@@ -190,6 +190,8 @@ BUGFIXES:
   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)

+ 2 - 1
build.xml

@@ -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>