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

[sa...@apache.org]

Author: sarowe
Date: Tue Mar 25 00:56:35 2014
New Revision: 1581170

URL: http://svn.apache.org/r1581170
Log:
SOLR-5760: move CHANGES.txt entry to 4.7.1 section (merged trunk r1581169)

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=1581170&r1=1581169&r2=1581170&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Mar 25 00:56:35 2014
@@ -109,10 +109,6 @@ New Features
 Bug Fixes
 ----------------------
 
-* SOLR-5760: ConcurrentUpdateSolrServer has a blockUntilFinished call when
-  streamDeletes is true that should be tucked into the if statement below it.
-  (Mark Miller, Gregory Chanan)
-
 * SOLR-5761: HttpSolrServer has a few fields that can be set via setters but
   are not volatile. (Mark Miller, Gregory Chanan)
 
@@ -276,6 +272,10 @@ Bug Fixes
 * SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis
   when calculating elapsed time. (Mark Miller, Ramkumar Aiyengar)
 
+* SOLR-5760: ConcurrentUpdateSolrServer has a blockUntilFinished call when
+  streamDeletes is true that should be tucked into the if statement below it.
+  (Mark Miller, Gregory Chanan)
+
 ==================  4.7.0 ==================
 
 Versions of Major Components