Fix merge error in CHANGES.txt

This commit is contained in:
Uwe Schindler 2016-02-19 11:01:29 +01:00
parent eb0e270043
commit 6ccb43a7b7
1 changed files with 0 additions and 2 deletions

View File

@ -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)