You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2018/04/28 19:55:46 UTC
[1/2] lucene-solr:branch_7x: Remove duplicate imports: merge error
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 83df2d626 -> 56998e6de
Remove duplicate imports: merge error
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/771a77fc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/771a77fc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/771a77fc
Branch: refs/heads/branch_7x
Commit: 771a77fc23ba5c17803384cac13938dd905d42c2
Parents: f1f5720
Author: Karl Wright <Da...@gmail.com>
Authored: Sat Apr 28 15:55:17 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Sat Apr 28 15:55:17 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/771a77fc/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
index e5c0f62..0b1baa0 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
@@ -17,9 +17,6 @@
package org.apache.lucene.spatial3d.geom;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
import java.io.InputStream;
[2/2] lucene-solr:branch_7x: Merge branch 'branch_7x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x
Posted by kw...@apache.org.
Merge branch 'branch_7x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/56998e6d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/56998e6d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/56998e6d
Branch: refs/heads/branch_7x
Commit: 56998e6de3d1c71ad19a7400a99cd7dd2925de05
Parents: 771a77f 83df2d6
Author: Karl Wright <Da...@gmail.com>
Authored: Sat Apr 28 15:55:37 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Sat Apr 28 15:55:37 2018 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 8 +++-
.../miscellaneous/WordDelimiterFilter.java | 13 +++++-
.../miscellaneous/WordDelimiterGraphFilter.java | 18 ++++++--
.../miscellaneous/TestWordDelimiterFilter.java | 43 +++++++++++++++-----
.../TestWordDelimiterGraphFilter.java | 32 +++++++++++++++
.../facet/taxonomy/SearcherTaxonomyManager.java | 12 +++++-
.../taxonomy/TestSearcherTaxonomyManager.java | 26 ++++++++++++
7 files changed, 134 insertions(+), 18 deletions(-)
----------------------------------------------------------------------