You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by el...@apache.org on 2014/03/19 18:45:30 UTC

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

Author: elyograg
Date: Wed Mar 19 17:45:29 2014
New Revision: 1579316

URL: http://svn.apache.org/r1579316
Log:
SOLR-5881: Upgrade zookeeper to 3.4.6 (merge trunk r1579275)

Added:
    lucene/dev/branches/branch_4x/solr/licenses/zookeeper-3.4.6.jar.sha1
      - copied unchanged from r1579275, lucene/dev/trunk/solr/licenses/zookeeper-3.4.6.jar.sha1
Removed:
    lucene/dev/branches/branch_4x/solr/licenses/zookeeper-3.4.5.jar.sha1
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/ivy-versions.properties   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt
    lucene/dev/branches/branch_4x/solr/licenses/   (props changed)

Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1579316&r1=1579315&r2=1579316&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Wed Mar 19 17:45:29 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/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1579316&r1=1579315&r2=1579316&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Mar 19 17:45:29 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.7
 ----------------------
@@ -46,6 +46,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
 ----------------------
 
@@ -186,6 +188,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