You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/11/30 12:03:10 UTC

svn commit: r1717227 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt

Author: cpoerschke
Date: Mon Nov 30 11:03:10 2015
New Revision: 1717227

URL: http://svn.apache.org/viewvc?rev=1717227&view=rev
Log:
SOLR-8340: move solr/CHANGES.txt entry from 5.4.0 to 5.5.0 section (merge in revision 1717226 from trunk)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1717227&r1=1717226&r2=1717227&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Nov 30 11:03:10 2015
@@ -17,8 +17,6 @@ Other Changes
 * LUCENE-6900: Added test for score ordered grouping, and refactored TopGroupsResultTransformer.
   (David Smiley)
 
-* SOLR-8340: Fixed NullPointerException in HighlightComponent.
-  (zengjie via Christine Poerschke)
 
 
 ==================  5.4.0 ==================
@@ -289,6 +287,8 @@ Bug Fixes
 
 * SOLR-8326: If BasicAuth enabled, inter node requests fail after node restart (noble, Anshum Gupta)
 
+* SOLR-8340: Fixed NullPointerException in HighlightComponent.
+  (zengjie via Christine Poerschke)
 
 Optimizations
 ----------------------