lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject [lucene-solr] 01/02: Merge branch 'master' into jira/SOLR-14136
Date Tue, 24 Dec 2019 00:03:01 GMT
This is an automated email from the ASF dual-hosted git repository.

rmuir pushed a commit to branch jira/SOLR-14136
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 3c37aee2a4b062c160e505e9cb5191fb147e310a
Merge: 7b061c2 1be5b68
Author: Robert Muir <rmuir@apache.org>
AuthorDate: Mon Dec 23 15:59:00 2019 -0800

    Merge branch 'master' into jira/SOLR-14136

 lucene/CHANGES.txt                                 |   9 +-
 .../lucene/analysis/ja/dict/UserDictionary.java    |   2 +-
 .../analysis/ja/dict/UserDictionaryTest.java       |  12 ++
 .../org/apache/lucene/analysis/ja/userdict.txt     |   4 +
 .../search/uhighlight/DefaultPassageFormatter.java |  10 +-
 .../uhighlight/TestDefaultPassageFormatter.java    |  51 +++++++++
 .../search/uhighlight/TestUnifiedHighlighter.java  |   2 +-
 .../TestUnifiedHighlighterTermIntervals.java       |   2 +-
 .../lucene/search/spell/DirectSpellChecker.java    |  24 +++-
 .../search/spell/TestDirectSpellChecker.java       |   8 ++
 solr/CHANGES.txt                                   |   5 +
 solr/bin/solr                                      |   5 +
 solr/bin/solr.cmd                                  |   5 +
 solr/bin/solr.in.cmd                               |   3 +
 solr/bin/solr.in.sh                                |   3 +
 .../java/org/apache/solr/handler/GraphHandler.java |  25 ++++-
 .../org/apache/solr/handler/SolrConfigHandler.java |  11 +-
 .../org/apache/solr/handler/StreamHandler.java     |  82 ++++++++++----
 .../org/apache/solr/pkg/PackagePluginHolder.java   |   7 +-
 .../src/test-files/runtimecode/expressible.jar.bin | Bin 0 -> 1977 bytes
 solr/core/src/test-files/runtimecode/sig.txt       |   9 ++
 .../highlight/TestPostingsSolrHighlighter.java     |   2 +-
 .../solr/highlight/TestUnifiedSolrHighlighter.java |   2 +-
 .../src/test/org/apache/solr/pkg/TestPackages.java |  45 +++++++-
 solr/server/etc/jetty-requestlog.xml               |  43 ++++++++
 solr/server/etc/jetty.xml                          |  30 -----
 solr/server/modules/requestlog.mod                 |   9 ++
 .../client/solrj/io/stream/expr/StreamFactory.java | 121 ++++++++++++---------
 .../org/apache/solr/client/solrj/io/TestLang.java  |   3 +-
 29 files changed, 404 insertions(+), 130 deletions(-)



Mime
View raw message