[2/2] lucene-solr git commit: Merge 5.5.1 changes sections from SOLR-8737 and SOLR-8734 tickets.

[cp...@apache.org]

Merge 5.5.1 changes sections from SOLR-8737 and SOLR-8734 tickets.


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

Branch: refs/heads/branch_5_5
Commit: c7214a2ba5f96492e5c4cd6a558734217afe5089
Parents: 55b3614
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 26 17:44:53 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 26 17:44:53 2016 +0000

----------------------------------------------------------------------
 solr/CHANGES.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c7214a2b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6539b4c..be910c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -8,18 +8,13 @@ caching, replication, and a web administration interface.
 
 See http://lucene.apache.org/solr for more information.
 
-==================  5.5.1 ==================
+======================= 5.5.1 =======================
 
 Bug Fixes
 ----------------------
 
 * SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy)
 
-======================= 5.5.1 =======================
-
-Bug Fixes
-----------------------
-
 * SOLR-8734: fix (maxMergeDocs|mergeFactor) deprecation warnings: in solrconfig.xml
   <maxMergeDocs|mergeFactor> may not be combined with <mergePolicyFactory> and
   <maxMergeDocs|mergeFactor> on their own or combined with <mergePolicy> is a warning.