You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/25 02:32:54 UTC
svn commit: r1581179 - in /lucene/dev/branches/lucene_solr_4_7: ./ solr/
solr/CHANGES.txt
Author: markrmiller
Date: Tue Mar 25 01:32:54 2014
New Revision: 1581179
URL: http://svn.apache.org/r1581179
Log:
SOLR-5907: Fix messed up merge - conflicted twice and screwed up the second merge.
Modified:
lucene/dev/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (contents, props changed)
Modified: lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt?rev=1581179&r1=1581178&r2=1581179&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt Tue Mar 25 01:32:54 2014
@@ -84,13 +84,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)
@@ -98,7 +91,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