You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2016/03/25 20:37:29 UTC
[2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9cbaa028
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9cbaa028
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9cbaa028
Branch: refs/heads/branch_6x
Commit: 9cbaa028dc09774395b4454c1433a1b18bbdfb53
Parents: 8254724 e26a443
Author: Ryan McKinley <ry...@apache.org>
Authored: Fri Mar 25 12:36:30 2016 -0700
Committer: Ryan McKinley <ry...@apache.org>
Committed: Fri Mar 25 12:36:30 2016 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 12 +
.../org/apache/lucene/util/bkd/BKDWriter.java | 14 +-
.../lucene/util/bkd/OfflinePointReader.java | 25 ++
.../org/apache/lucene/util/bkd/PointReader.java | 12 +
.../highlight/WeightedSpanTermExtractor.java | 7 +-
.../custom/HighlightCustomQueryTest.java | 15 +
.../org/apache/lucene/search/join/JoinUtil.java | 274 ++++++++++++++-
.../join/PointInSetIncludingScoreQuery.java | 340 +++++++++++++++++++
.../apache/lucene/search/join/TestJoinUtil.java | 54 ++-
.../lucene/spatial3d/geom/PlanetModel.java | 120 ++++---
.../lucene/spatial3d/geom/GeoPointTest.java | 33 ++
solr/CHANGES.txt | 3 +
.../handler/component/RealTimeGetComponent.java | 13 +-
.../solr/collection1/conf/schema15.xml | 1 +
.../solr/collection1/conf/schema_latest.xml | 51 ++-
.../org/apache/solr/search/TestRealTimeGet.java | 49 ++-
16 files changed, 928 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9cbaa028/solr/CHANGES.txt
----------------------------------------------------------------------