lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject [36/36] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master' into jira/solr-8593
Date Thu, 10 Nov 2016 21:16:06 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/c3400e8a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c3400e8a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c3400e8a

Branch: refs/heads/jira/solr-8593
Commit: c3400e8a2ee8dd2e6ed6ced7a7f04fd40f6b577d
Parents: 1489fb9 c4c5e86
Author: Kevin Risden <krisden@apache.org>
Authored: Thu Nov 10 16:15:06 2016 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Thu Nov 10 16:15:06 2016 -0500

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   25 +-
 lucene/analysis/kuromoji/ivy.xml                |    2 +-
 .../ja/dict/TokenInfoDictionary$fst.dat         |  Bin 1716198 -> 1698563 bytes
 .../analysis/ja/util/ConnectionCostsWriter.java |    1 -
 .../ja/util/TokenInfoDictionaryBuilder.java     |    4 +-
 .../index/TestBackwardsCompatibility.java       |    4 +-
 .../org/apache/lucene/index/index.6.3.0-cfs.zip |  Bin 0 -> 15869 bytes
 .../apache/lucene/index/index.6.3.0-nocfs.zip   |  Bin 0 -> 15876 bytes
 .../blocktreeords/OrdsBlockTreeTermsWriter.java |    4 +-
 .../codecs/memory/MemoryPostingsFormat.java     |   18 +-
 .../codecs/blocktree/BlockTreeTermsWriter.java  |    4 +-
 .../GrowableByteArrayDataOutput.java            |    2 +-
 .../lucene/index/BinaryDocValuesWriter.java     |   15 +-
 .../lucene/index/DefaultIndexingChain.java      |    4 +
 .../apache/lucene/index/DocsWithFieldSet.java   |   62 +
 .../org/apache/lucene/index/IndexWriter.java    |    8 +
 .../apache/lucene/index/NormValuesWriter.java   |   15 +-
 .../lucene/index/NumericDocValuesWriter.java    |   15 +-
 .../lucene/index/SortedDocValuesWriter.java     |   15 +-
 .../index/SortedNumericDocValuesWriter.java     |   15 +-
 .../lucene/index/SortedSetDocValuesWriter.java  |   15 +-
 .../org/apache/lucene/search/PhraseQuery.java   |    2 +-
 .../search/similarities/BM25Similarity.java     |   20 +-
 .../search/similarities/BooleanSimilarity.java  |   95 +
 .../search/similarities/ClassicSimilarity.java  |   13 +
 .../search/similarities/TFIDFSimilarity.java    |   12 +-
 .../lucene/search/spans/SpanNotQuery.java       |   14 +-
 .../java/org/apache/lucene/util/BytesRef.java   |    2 +-
 .../org/apache/lucene/util/BytesRefBuilder.java |    4 +-
 .../org/apache/lucene/util/UnicodeUtil.java     |    5 +
 .../org/apache/lucene/util/fst/Builder.java     |   28 +-
 .../java/org/apache/lucene/util/fst/FST.java    |  633 +-----
 .../apache/lucene/util/fst/package-info.java    |    1 -
 .../TestGrowableByteArrayDataOutput.java        |    4 +-
 .../lucene/index/TestDocsWithFieldSet.java      |   80 +
 .../apache/lucene/index/TestIndexWriter.java    |   30 +
 .../similarities/TestBooleanSimilarity.java     |  117 ++
 .../apache/lucene/search/spans/TestBasics.java  |   30 +-
 .../apache/lucene/search/spans/TestSpans.java   |   79 +-
 .../org/apache/lucene/util/TestUnicodeUtil.java |    6 +-
 .../lucene/util/automaton/TestUTF32ToUTF8.java  |    2 +-
 .../org/apache/lucene/util/fst/Test2BFST.java   |   17 +-
 .../org/apache/lucene/util/fst/TestFSTs.java    |   27 +-
 .../uhighlight/AnalysisOffsetStrategy.java      |   15 +-
 .../uhighlight/MultiTermHighlighting.java       |   32 +-
 .../lucene/search/uhighlight/PhraseHelper.java  |   19 +-
 .../search/uhighlight/UnifiedHighlighter.java   |   35 +-
 .../uhighlight/TestUnifiedHighlighterMTQ.java   |   88 +
 .../TestUnifiedHighlighterStrictPhrases.java    |   77 +
 lucene/ivy-versions.properties                  |    2 +-
 .../idversion/VersionBlockTreeTermsWriter.java  |    4 +-
 .../lucene/search/TermAutomatonQuery.java       |   86 +-
 .../lucene/search/TestTermAutomatonQuery.java   |  193 +-
 .../suggest/fst/FSTCompletionBuilder.java       |    4 +-
 .../org/apache/lucene/search/CheckHits.java     |   10 +-
 .../search/similarities/RandomSimilarity.java   |    1 +
 .../util/TestRuleSetupAndRestoreClassEnv.java   |    3 +-
 .../org/apache/lucene/util/fst/FSTTester.java   |   14 +-
 solr/CHANGES.txt                                |   43 +-
 solr/bin/solr                                   |   14 +-
 .../handler/clustering/ClusteringComponent.java |   12 +-
 .../carrot2/CarrotClusteringEngine.java         |   29 +-
 .../clustering/carrot2/CarrotParams.java        |   10 +-
 .../SolrStopwordsCarrot2LexicalDataFactory.java |   49 +-
 .../carrot2/CarrotClusteringEngineTest.java     |   27 +-
 .../carrot2/EchoClusteringAlgorithm.java        |    5 +-
 .../carrot2/EchoStemsClusteringAlgorithm.java   |    5 +-
 .../carrot2/EchoTokensClusteringAlgorithm.java  |    5 +-
 ...exicalResourcesCheckClusteringAlgorithm.java |    5 +-
 .../carrot2/MockClusteringAlgorithm.java        |    4 +-
 .../java/org/apache/solr/cloud/BackupCmd.java   |  140 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |   49 +-
 .../java/org/apache/solr/cloud/RestoreCmd.java  |    2 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   18 +-
 .../apache/solr/core/backup/BackupManager.java  |    3 +-
 .../solr/core/snapshots/SolrSnapshotsTool.java  |  468 +++++
 .../org/apache/solr/handler/ExportHandler.java  |   48 +
 .../org/apache/solr/handler/ExportWriter.java   | 1711 +++++++++++++++++
 .../solr/handler/admin/CollectionsHandler.java  |    6 +
 .../solr/handler/admin/PrepRecoveryOp.java      |    3 +
 .../handler/component/HttpShardHandler.java     |   50 +-
 .../component/HttpShardHandlerFactory.java      |   21 +-
 .../solr/handler/component/QueryComponent.java  |    3 +-
 .../component/ReplicaListTransformer.java       |   35 +
 .../ShufflingReplicaListTransformer.java        |   39 +
 .../apache/solr/request/DocValuesFacets.java    |   13 +-
 .../solr/request/macro/MacroExpander.java       |    2 +
 .../solr/response/JSONResponseWriter.java       |   64 +-
 .../solr/response/SortingResponseWriter.java    | 1805 ------------------
 .../solr/response/TextResponseWriter.java       |   30 +-
 .../solr/search/facet/FacetProcessor.java       |   67 +-
 .../apache/solr/search/facet/FacetRequest.java  |   19 +
 .../org/apache/solr/util/TestInjection.java     |   32 +
 solr/core/src/resources/ImplicitPlugins.json    |    6 +-
 .../AbstractCloudBackupRestoreTestCase.java     |   16 +
 .../apache/solr/cloud/TestCloudRecovery.java    |    8 +
 .../solr/cloud/TestHdfsCloudBackupRestore.java  |   56 +
 .../test/org/apache/solr/core/SolrCoreTest.java |    2 +-
 .../component/ReplicaListTransformerTest.java   |  163 ++
 .../ShufflingReplicaListTransformerTest.java    |   76 +
 .../solr/request/macro/TestMacroExpander.java   |   13 +
 .../apache/solr/response/JSONWriterTest.java    |    9 +-
 .../apache/solr/response/TestExportWriter.java  |  195 ++
 .../apache/solr/response/TestPushWriter.java    |   81 +
 .../response/TestSortingResponseWriter.java     |  190 --
 .../solr/search/facet/TestJsonFacets.java       |   57 +-
 solr/example/files/conf/update-script.js        |    9 +-
 solr/licenses/carrot2-mini-3.12.0.jar.sha1      |    1 -
 solr/licenses/carrot2-mini-3.15.0.jar.sha1      |    1 +
 .../scripts/cloud-scripts/snapshotscli.sh       |  176 ++
 .../org/apache/solr/client/solrj/io/Tuple.java  |   21 +-
 .../client/solrj/io/stream/TupleStream.java     |   67 +-
 .../solrj/io/stream/expr/Explanation.java       |    1 -
 .../solrj/request/CollectionAdminRequest.java   |   14 +
 .../solr/client/solrj/response/Cluster.java     |   48 +-
 .../solrj/response/ClusteringResponse.java      |   48 +-
 .../org/apache/solr/common/IteratorWriter.java  |   65 +
 .../java/org/apache/solr/common/MapWriter.java  |   90 +
 .../java/org/apache/solr/common/PushWriter.java |   42 +
 .../common/params/CollectionAdminParams.java    |   24 +
 .../apache/solr/common/util/JavaBinCodec.java   |  184 +-
 .../solrj/sampleClusteringResponse.xml          |   19 +
 .../solrj/response/TestClusteringResponse.java  |   62 +-
 .../java/org/apache/solr/util/TestHarness.java  |   27 +-
 solr/webapp/web/js/angular/app.js               |    2 +-
 125 files changed, 5413 insertions(+), 3228 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c3400e8a/lucene/ivy-versions.properties
----------------------------------------------------------------------


Mime
View raw message