You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/14 14:46:45 UTC

lucene-solr git commit: absorb the un-released 5.4.2 changes into 5.5.0's section

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_5_5 528fb8702 -> 1d6014b5c


absorb the un-released 5.4.2 changes into 5.5.0's section


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

Branch: refs/heads/branch_5_5
Commit: 1d6014b5c6b56fa8aab4142074e5befc2ce7f249
Parents: 528fb87
Author: Mike McCandless <mi...@apache.org>
Authored: Sun Feb 14 08:47:36 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Sun Feb 14 08:47:36 2016 -0500

----------------------------------------------------------------------
 lucene/CHANGES.txt | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1d6014b5/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 2752f5f..a673bd8 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -128,6 +128,12 @@ Bug Fixes
   after NumericTokenStream was exhausted.  (Uwe Schindler, Lee Hinman,
   Mike McCandless)
 
+* LUCENE-7018: Fix GeoPointTermQueryConstantScoreWrapper to add document on
+  first GeoPointField match. (Nick Knize)
+
+* LUCENE-7019: Add two-phase iteration to GeoPointTermQueryConstantScoreWrapper.
+  (Robert Muir via Nick Knize)
+
 Other
 
 * LUCENE-6924: Upgrade randomizedtesting to 2.3.2. (Dawid Weiss)
@@ -184,16 +190,6 @@ Other
   TestSortingMergePolicy now extend it, TestUpgradeIndexMergePolicy added)
   (Christine Poerschke)
 
-======================= Lucene 5.4.2 =======================
-
-Bug Fixes
-
-* LUCENE-7018: Fix GeoPointTermQueryConstantScoreWrapper to add document on
-  first GeoPointField match. (Nick Knize)
-
-* LUCENE-7019: add two-phase iteration to GeoPointTermQueryConstantScoreWrapper.
-  (Robert Muir via Nick Knize)
-
 ======================= Lucene 5.4.1 =======================
 
 Bug Fixes