You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/01/23 11:52:40 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/4a5578dc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4a5578dc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4a5578dc

Branch: refs/heads/branch_6x
Commit: 4a5578dc32308ed8a1e01639dd9e53b3be5bcaf1
Parents: 7852b20 6818de1
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Jan 23 18:52:21 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Jan 23 18:52:21 2017 +0700

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  5 --
 .../apache/lucene/search/DisjunctionScorer.java |  4 +-
 .../lucene/search/MinShouldMatchSumScorer.java  | 16 +++---
 .../java/org/apache/lucene/search/Scorer.java   | 14 ++----
 .../search/TestBooleanQueryVisitSubscorers.java | 51 ++++----------------
 .../lucene/search/TestSubScorerFreqs.java       | 19 +++-----
 .../facet/AssertingSubDocsAtOnceCollector.java  |  3 +-
 .../apache/lucene/search/AssertingScorer.java   |  1 -
 .../org/apache/solr/ltr/LTRScoringQuery.java    |  2 +-
 9 files changed, 33 insertions(+), 82 deletions(-)
----------------------------------------------------------------------