You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/03/25 04:01:24 UTC

svn commit: r1581198 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt

Author: sarowe
Date: Tue Mar 25 03:01:23 2014
New Revision: 1581198

URL: http://svn.apache.org/r1581198
Log:
SOLR-5796: move CHANGES.txt entries to 4.7.1 section (merged trunk r1581196)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1581198&r1=1581197&r2=1581198&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Mar 25 03:01:23 2014
@@ -109,9 +109,6 @@ New Features
 Bug Fixes
 ----------------------
 
-* SOLR-5796: Increase how long we are willing to wait for a core to see the ZK
-  advertised leader in it's local state. (Timothy Potter, Mark Miller)  
-
 * SOLR-5818: distrib search with custom comparator does not quite work correctly
   (Ryan Ernst)
 
@@ -175,10 +172,6 @@ Other Changes
   behavior of silently ignoring these terms, use LengthFilter in your Analyzer.
   (hossman, Mike McCandless, Varun Thacker)
 
-* SOLR-5796: Make how long we are willing to wait for a core to see the ZK
-  advertised leader in it's local state configurable. 
-  (Timothy Potter via Mark Miller)
-  
 * SOLR-5825: Separate http request creating and execution in SolrJ
   (Steven Bower via Erick Erickson)
   
@@ -281,6 +274,16 @@ Bug Fixes
 * SOLR-5811: The Overseer will retry work items until success, which is a serious
   problem if you hit a bad work item. (Mark Miller)
 
+* SOLR-5796: Increase how long we are willing to wait for a core to see the ZK
+  advertised leader in it's local state. (Timothy Potter, Mark Miller)
+
+Other Changes
+---------------------
+
+* SOLR-5796: Make how long we are willing to wait for a core to see the ZK
+  advertised leader in it's local state configurable.
+  (Timothy Potter via Mark Miller)
+
 ==================  4.7.0 ==================
 
 Versions of Major Components