From 6ccb43a7b7d2fdd1dabcd28dfbc828869851a16a Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Fri, 19 Feb 2016 11:01:29 +0100 Subject: [PATCH] Fix merge error in CHANGES.txt --- solr/CHANGES.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 3fba69d625a..2e338275ef1 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -266,8 +266,6 @@ Other Changes * SOLR-5730: Make Lucene's SortingMergePolicy and EarlyTerminatingSortingCollector configurable in Solr. (Christine Poerschke, hossmann, Tomás Fernández Löbbe, Shai Erera) -Other Changes ----------------------- * SOLR-8677: Prevent shards containing invalid characters from being created. Checks added server-side and in SolrJ. (Shai Erera, Jason Gerlowski, Anshum Gupta)