lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [14/50] lucene-solr:jira/solr-9858: Merge branch 'apache-https-master' into jira/solr-8593
Date Thu, 16 Feb 2017 13:47:04 GMT
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/750cf6d7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/750cf6d7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/750cf6d7

Branch: refs/heads/jira/solr-9858
Commit: 750cf6d7a51dbf44342c2ca78910458ba63933fa
Parents: bda84d8 3c4315c
Author: Kevin Risden <krisden@apache.org>
Authored: Fri Nov 18 10:42:14 2016 -0600
Committer: Kevin Risden <krisden@apache.org>
Committed: Fri Nov 18 10:42:14 2016 -0600

----------------------------------------------------------------------
 dev-tools/scripts/smokeTestRelease.py           |  28 +-
 lucene/CHANGES.txt                              |  25 ++
 .../ASCIIFoldingFilterFactory.java              |  17 +-
 .../TestAsciiFoldingFilterFactory.java          |  54 ++++
 .../index/TestBackwardsCompatibility.java       |  82 ++++++
 .../org/apache/lucene/index/sorted.6.2.0.zip    | Bin 0 -> 157007 bytes
 .../org/apache/lucene/index/sorted.6.2.1.zip    | Bin 0 -> 100974 bytes
 .../org/apache/lucene/index/sorted.6.3.0.zip    | Bin 0 -> 71090 bytes
 .../org/apache/lucene/util/QueryBuilder.java    |   2 +-
 .../uhighlight/AnalysisOffsetStrategy.java      |   3 +
 .../uhighlight/DefaultPassageFormatter.java     | 204 +++++++-------
 .../search/uhighlight/FieldHighlighter.java     |  30 +-
 .../lucene/search/uhighlight/OffsetsEnum.java   |   8 +-
 .../lucene/search/uhighlight/Passage.java       | 276 ++++++++++---------
 .../uhighlight/TokenStreamOffsetStrategy.java   |   7 +-
 .../uhighlight/TestUnifiedHighlighterMTQ.java   |  14 +-
 .../lucene/queryparser/classic/QueryParser.java |  78 ++++--
 .../lucene/queryparser/classic/QueryParser.jj   |  28 ++
 .../queryparser/classic/QueryParserBase.java    |   2 +-
 .../queryparser/classic/TestQueryParser.java    |  14 +
 .../queryparser/util/QueryParserTestBase.java   |   4 +
 .../lucene/replicator/nrt/PrimaryNode.java      |   2 +-
 .../analyzing/AnalyzingInfixSuggester.java      |  82 +++++-
 .../document/CompletionFieldsConsumer.java      |   4 +
 .../analyzing/AnalyzingInfixSuggesterTest.java  | 111 ++++++++
 .../document/TestPrefixCompletionQuery.java     |  49 +++-
 .../index/BasePostingsFormatTestCase.java       |  45 +++
 solr/CHANGES.txt                                |  13 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   6 +-
 .../solr/handler/component/QueryComponent.java  |  10 +-
 .../java/org/apache/solr/util/CryptoKeys.java   |   6 +-
 .../store/blockcache/BlockDirectoryTest.java    |   2 +-
 .../client/solrj/io/sql/ConnectionImpl.java     |   9 +
 .../apache/solr/common/util/JavaBinCodec.java   |   2 +-
 34 files changed, 890 insertions(+), 327 deletions(-)
----------------------------------------------------------------------



Mime
View raw message