svn commit: r1579275 - in /lucene/dev/trunk: lucene/ivy-versions.properties solr/CHANGES.txt solr/licenses/zookeeper-3.4.5.jar.sha1 solr/licenses/zookeeper-3.4.6.jar.sha1

[el...@apache.org]

Author: elyograg
Date: Wed Mar 19 16:10:53 2014
New Revision: 1579275

URL: http://svn.apache.org/r1579275
Log:
SOLR-5881: Upgrade zookeeper to 3.4.6.

Added:
    lucene/dev/trunk/solr/licenses/zookeeper-3.4.6.jar.sha1   (with props)
Removed:
    lucene/dev/trunk/solr/licenses/zookeeper-3.4.5.jar.sha1
Modified:
    lucene/dev/trunk/lucene/ivy-versions.properties
    lucene/dev/trunk/solr/CHANGES.txt

Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1579275&r1=1579274&r2=1579275&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Wed Mar 19 16:10:53 2014
@@ -147,7 +147,7 @@ org.apache.uima.version = 2.3.1
 /org.apache.velocity/velocity = 1.7
 /org.apache.velocity/velocity-tools = 2.0
 /org.apache.xmlbeans/xmlbeans = 2.3.0
-/org.apache.zookeeper/zookeeper = 3.4.5
+/org.apache.zookeeper/zookeeper = 3.4.6
 /org.aspectj/aspectjrt = 1.6.11
 
 org.bouncycastle.version = 1.45

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1579275&r1=1579274&r2=1579275&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 19 16:10:53 2014
@@ -28,7 +28,7 @@ Apache Tika 1.5
 Carrot2 3.8.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.5
+Apache ZooKeeper 3.4.6
 
 Upgrading from Solr 4.x
 ----------------------
@@ -74,7 +74,7 @@ Apache Tika 1.5
 Carrot2 3.8.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.5
+Apache ZooKeeper 3.4.6
 
 Upgrading from Solr 4.7
 ----------------------
@@ -92,6 +92,8 @@ Upgrading from Solr 4.7
   http://wiki.apache.org/lucene-java/JavaBugs
   Solr 4.8 was also tested to work with Java 8, so give it a try!
 
+* ZooKeeper is upgraded from 3.4.5 to 3.4.6.
+
 Detailed Change List
 ----------------------
 
@@ -242,6 +244,8 @@ Other Changes
 
 * SOLR-5763: Upgrade to Tika 1.5 (Vitaliy Zhovtyuk via Steve Rowe)
 
+* SOLR-5881: Upgrade ZooKeeper to 3.4.6 (Shawn Heisey)
+
 ==================  4.7.1  ==================
 
 Versions of Major Components

Added: lucene/dev/trunk/solr/licenses/zookeeper-3.4.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/zookeeper-3.4.6.jar.sha1?rev=1579275&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/zookeeper-3.4.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/zookeeper-3.4.6.jar.sha1 Wed Mar 19 16:10:53 2014
@@ -0,0 +1 @@
+01b2502e29da1ebaade2357cd1de35a855fa3755