You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/01/16 21:27:39 UTC
[14/14] lucene-solr:jira/solr-5944: Merge branch 'master' into
jira/solr-5944
Merge branch 'master' into jira/solr-5944
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/80cdc042
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/80cdc042
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/80cdc042
Branch: refs/heads/jira/solr-5944
Commit: 80cdc042749360b43fd541baf9774be12a4f27bd
Parents: 0402c1a 205f9cc
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Tue Jan 17 02:42:16 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Tue Jan 17 02:42:16 2017 +0530
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.core.prefs | 8 +-
lucene/CHANGES.txt | 29 ++--
.../analysis/ngram/EdgeNGramTokenFilter.java | 16 +-
.../lucene/analysis/ngram/NGramTokenFilter.java | 18 +--
.../lucene/analysis/ngram/TestNGramFilters.java | 47 ++++++
.../lucene/search/DoubleValuesSource.java | 92 +++++++++--
.../java/org/apache/lucene/util/Version.java | 7 +
.../queries/function/FunctionMatchQuery.java | 99 ++++++++++++
.../queries/function/FunctionScoreQuery.java | 151 +++++++++++++++++++
.../function/TestFunctionMatchQuery.java | 61 ++++++++
.../function/TestFunctionScoreExplanations.java | 105 +++++++++++++
.../function/TestFunctionScoreQuery.java | 114 ++++++++++++++
.../lucene/queryparser/xml/CoreParser.java | 2 -
solr/CHANGES.txt | 17 +++
.../ApacheLuceneSolrNearQueryBuilder.java | 1 -
.../apache/solr/search/GoodbyeQueryBuilder.java | 1 -
.../apache/solr/search/HandyQueryBuilder.java | 1 -
.../apache/solr/search/HelloQueryBuilder.java | 1 -
.../solr/cloud/AbstractDistribZkTestBase.java | 5 +-
19 files changed, 709 insertions(+), 66 deletions(-)
----------------------------------------------------------------------