svn commit: r1581177 - /lucene/dev/trunk/solr/CHANGES.txt

[ma...@apache.org]

Author: markrmiller
Date: Tue Mar 25 01:31:08 2014
New Revision: 1581177

URL: http://svn.apache.org/r1581177
Log:
SOLR-5907: Fix messed up merge - conflicted twice and screwed up the second merge.

Modified:
    lucene/dev/trunk/solr/CHANGES.txt

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1581177&r1=1581176&r2=1581177&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Mar 25 01:31:08 2014
@@ -322,13 +322,6 @@ Bug Fixes
 * SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis
   when calculating elapsed time. (Mark Miller, Ramkumar Aiyengar)
 
-<<<<<<< .mine
-* SOLR-5907: The hdfs write cache can cause a reader to see a corrupted state.
-  It now defaults to off, and if you were using solr.hdfs.blockcache.write.enabled
-  explicitly, you should set it to false.
-  (Mark Miller)
-
-=======
 * 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)
@@ -336,7 +329,11 @@ Bug Fixes
 * SOLR-5761: HttpSolrServer has a few fields that can be set via setters but
   are not volatile. (Mark Miller, Gregory Chanan)
 
->>>>>>> .r1581173
+* SOLR-5907: The hdfs write cache can cause a reader to see a corrupted state.
+  It now defaults to off, and if you were using solr.hdfs.blockcache.write.enabled
+  explicitly, you should set it to false.
+  (Mark Miller)
+
 ==================  4.7.0 ==================
 
 Versions of Major Components