You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/11/12 17:16:40 UTC

[8/8] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master' into jira/solr-8593

Merge branch 'apache-https-master' into jira/solr-8593


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

Branch: refs/heads/jira/solr-8593
Commit: 368204bf464abad947410dfb0bd23e8ead47ae5b
Parents: c3400e8 4d94510
Author: Kevin Risden <kr...@apache.org>
Authored: Sat Nov 12 11:16:18 2016 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Sat Nov 12 11:16:18 2016 -0600

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py           |  23 +-
 lucene/CHANGES.txt                              |  12 +
 .../analysis/ja/JapaneseTokenizerFactory.java   |  17 +-
 lucene/benchmark/build.xml                      |   6 +-
 lucene/build.xml                                |   2 +-
 lucene/common-build.xml                         |   6 +-
 .../search/grouping/GroupingSearchTest.java     |  10 +-
 .../lucene/search/grouping/TestGrouping.java    |   2 +
 solr/contrib/ltr/README.md                      |  10 +-
 solr/contrib/ltr/example/solrconfig.xml         |   4 +-
 .../LTRFeatureLoggerTransformerFactory.java     | 256 +++++++++++++++++++
 .../ltr/response/transform/package-info.java    |  23 ++
 .../solr/ltr/search/LTRQParserPlugin.java       | 241 +++++++++++++++++
 .../apache/solr/ltr/search/package-info.java    |  23 ++
 .../LTRFeatureLoggerTransformerFactory.java     | 254 ------------------
 .../solr/response/transform/package-info.java   |  23 --
 .../apache/solr/search/LTRQParserPlugin.java    | 233 -----------------
 .../org/apache/solr/search/package-info.java    |  23 --
 solr/contrib/ltr/src/java/overview.html         |   6 +-
 .../solr/collection1/conf/solrconfig-ltr.xml    |   4 +-
 .../collection1/conf/solrconfig-ltr_Th10_10.xml |   4 +-
 .../collection1/conf/solrconfig-multiseg.xml    |   6 +-
 .../apache/solr/ltr/TestLTRQParserPlugin.java   |  14 +
 .../solr/ltr/store/rest/TestModelManager.java   |   2 +-
 24 files changed, 628 insertions(+), 576 deletions(-)
----------------------------------------------------------------------