svn commit: r1735121 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/contrib/build-contrib.xml

[ph...@apache.org]

Author: phunt
Date: Tue Mar 15 16:05:11 2016
New Revision: 1735121

URL: http://svn.apache.org/viewvc?rev=1735121&view=rev
Log:
ZOOKEEPER-2385 Zookeeper trunk build is failing on windows (Arshad Mohammad via phunt)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1735121&r1=1735120&r2=1735121&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Tue Mar 15 16:05:11 2016
@@ -129,6 +129,9 @@ BUGFIXES:
   ZOOKEEPER-2283 traceFile property is not used in the ZooKeeper, it
   should be removed from documentation (Arshad Mohammad via phunt)
 
+  ZOOKEEPER-2385 Zookeeper trunk build is failing on windows
+  (Arshad Mohammad via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml?rev=1735121&r1=1735120&r2=1735121&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml (original)
+++ zookeeper/branches/branch-3.5/src/contrib/build-contrib.xml Tue Mar 15 16:05:11 2016
@@ -41,7 +41,7 @@
 
   <property name="build.encoding" value="utf8"/>
 
-  <property name="ivy.version" value="2.2.0"/>
+  <property name="ivy.version" value="2.4.0"/>
   <property name="ivy.url"
             value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
   <property name="ivy.home" value="${user.home}/.ant" />