You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/02/19 11:01:43 UTC

lucene-solr git commit: Fix merge error in CHANGES.txt

Repository: lucene-solr
Updated Branches:
  refs/heads/master eb0e27004 -> 6ccb43a7b


Fix merge error in CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6ccb43a7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6ccb43a7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6ccb43a7

Branch: refs/heads/master
Commit: 6ccb43a7b7d2fdd1dabcd28dfbc828869851a16a
Parents: eb0e270
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Feb 19 11:01:29 2016 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Feb 19 11:01:29 2016 +0100

----------------------------------------------------------------------
 solr/CHANGES.txt | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6ccb43a7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3fba69d..2e33827 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)