You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2019/12/18 16:38:44 UTC

[lucene-solr] 06/36: Merge branch 'master' into star-123

This is an automated email from the ASF dual-hosted git repository.

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

commit 23fcecaa4b914d94dec07d6cdc266d9d0b82eb02
Merge: 129a602 7ec41d1
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Jul 2 16:46:42 2019 +0200

    Merge branch 'master' into star-123

 README.md                                          |    4 +
 dev-tools/scripts/jenkins.build.ref.guide.sh       |    2 +-
 lucene/CHANGES.txt                                 |   61 +-
 lucene/MIGRATE.txt                                 |    4 +
 .../lucene/analysis/et/EstonianAnalyzer.java       |  127 ++
 .../apache/lucene/analysis/et/package-info.java}   |   17 +-
 .../analysis/util/AbstractAnalysisFactory.java     |   22 +
 .../lucene/analysis/util/AnalysisSPILoader.java    |   22 +-
 .../lucene/analysis/util/CharFilterFactory.java    |    9 +
 .../lucene/analysis/util/TokenFilterFactory.java   |   11 +-
 .../lucene/analysis/util/TokenizerFactory.java     |   11 +-
 .../org/tartarus/snowball/ext/EstonianStemmer.java | 1904 ++++++++++++++++++++
 .../org/apache/lucene/analysis/et/stopwords.txt    | 1603 ++++++++++++++++
 .../lucene/analysis/et/TestEstonianAnalyzer.java   |   62 +
 .../analysis/util/TestAbstractAnalysisFactory.java |   41 +
 lucene/analysis/kuromoji/build.xml                 |   51 +-
 .../analysis/ja/dict/TokenInfoDictionary.java      |   14 +-
 .../analysis/ja/util/BinaryDictionaryWriter.java   |   72 +-
 .../ja/util/CharacterDefinitionWriter.java         |   25 +-
 .../analysis/ja/util/ConnectionCostsBuilder.java   |   62 +
 .../analysis/ja/util/ConnectionCostsWriter.java    |   30 +-
 .../lucene/analysis/ja/util/DictionaryBuilder.java |   62 +
 .../ja/util/TokenInfoDictionaryBuilder.java        |  129 +-
 .../ja/util/TokenInfoDictionaryWriter.java         |   18 +-
 .../analysis/ja/util/UnknownDictionaryBuilder.java |  119 ++
 .../analysis/ja/util/UnknownDictionaryWriter.java  |    5 +-
 .../analysis/ja/dict/TokenInfoDictionary$fst.dat   |  Bin 1698570 -> 1698570 bytes
 ...ictionary.java => TokenInfoDictionaryTest.java} |   94 +-
 .../analysis/ja/util}/UnknownDictionaryTest.java   |    5 +-
 .../analysis/ja/util/ConnectionCostsBuilder.java   |   68 -
 .../lucene/analysis/ja/util/DictionaryBuilder.java |   85 -
 .../analysis/ja/util/UnknownDictionaryBuilder.java |  135 --
 .../analysis/ja/dict/TokenInfoDictionaryTest.java  |   85 -
 .../lucene/document/LatLonPointDistanceQuery.java  |  154 +-
 .../lucene/document/LatLonPointInPolygonQuery.java |   14 +-
 .../apache/lucene/document/RangeFieldQuery.java    |   16 +-
 .../java/org/apache/lucene/index/PointValues.java  |   10 +
 .../src/java/org/apache/lucene/index/Term.java     |   14 +-
 .../org/apache/lucene/search/AutomatonQuery.java   |   15 +-
 .../org/apache/lucene/search/BlendedTermQuery.java |    4 +-
 .../org/apache/lucene/search/BooleanQuery.java     |   42 +-
 .../org/apache/lucene/search/BooleanWeight.java    |   63 +-
 .../java/org/apache/lucene/search/FuzzyQuery.java  |    2 +-
 .../org/apache/lucene/search/IndexSearcher.java    |  102 +-
 .../org/apache/lucene/search/LRUQueryCache.java    |    2 +-
 .../org/apache/lucene/search/MatchesUtils.java     |   11 +
 .../org/apache/lucene/search/MultiTermQuery.java   |   26 +-
 .../search/MultiTermQueryConstantScoreWrapper.java |    2 +-
 .../org/apache/lucene/search/PointInSetQuery.java  |   51 +-
 .../org/apache/lucene/search/PointRangeQuery.java  |  132 +-
 .../org/apache/lucene/search/ScoringRewrite.java   |   12 +-
 .../org/apache/lucene/search/SynonymQuery.java     |    4 +-
 .../org/apache/lucene/search/TermInSetQuery.java   |    4 +-
 .../org/apache/lucene/search/TopTermsRewrite.java  |    2 +-
 .../org/apache/lucene/search/package-info.java     |    4 +-
 .../java/org/apache/lucene/util/ByteBlockPool.java |   18 +-
 .../src/java/org/apache/lucene/util/BytesRef.java  |    4 +-
 .../java/org/apache/lucene/util/BytesRefHash.java  |   16 +-
 .../src/java/org/apache/lucene/util/IntsRef.java   |    2 +-
 .../java/org/apache/lucene/util/LongBitSet.java    |    9 +-
 .../java/org/apache/lucene/util/QueryBuilder.java  |    9 +-
 .../org/apache/lucene/util/RamUsageEstimator.java  |  284 ++-
 .../lucene/util/automaton/CompiledAutomaton.java   |   17 +-
 .../apache/lucene/util/automaton/RunAutomaton.java |   17 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |  166 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |  148 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java    |   19 +
 .../java/org/apache/lucene/util/fst/FSTStore.java  |    1 +
 .../apache/lucene/util/fst/OffHeapFSTStore.java    |    5 +
 .../org/apache/lucene/util/fst/OnHeapFSTStore.java |   12 +-
 .../lucene/document/TestFeatureDoubleValues.java   |   16 +-
 .../org/apache/lucene/search/TestBooleanQuery.java |    2 +-
 .../apache/lucene/search/TestMaxClauseLimit.java   |  132 ++
 .../lucene/search/TestMultiTermQueryRewrites.java  |   14 +-
 .../org/apache/lucene/search/TestPointQueries.java |   94 +
 .../apache/lucene/search/TestTermRangeQuery.java   |    6 +-
 .../org/apache/lucene/util/TestQueryBuilder.java   |    7 +-
 .../apache/lucene/util/TestRamUsageEstimator.java  |   96 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   48 +-
 .../lucene/util/bkd/TestBKDRadixSelector.java      |   65 +-
 .../apache/lucene/util/bkd/TestBKDRadixSort.java   |  163 ++
 .../util/bkd/TestMutablePointsReaderUtils.java     |    1 +
 .../search/uhighlight/TestUnifiedHighlighter.java  |    4 +-
 .../lucene/search/join/GlobalOrdinalsQuery.java    |   19 +-
 .../search/join/GlobalOrdinalsWithScoreQuery.java  |   18 +-
 .../search/join/PointInSetIncludingScoreQuery.java |   17 +-
 .../search/join/TermsIncludingScoreQuery.java      |   20 +-
 .../org/apache/lucene/search/join/TermsQuery.java  |   18 +-
 .../analysis/AnalysisChainDialogFactory.java       |    9 +-
 .../lucene/luke/models/analysis/AnalysisImpl.java  |    7 +-
 .../luke/models/analysis/AnalysisImplTest.java     |    6 +-
 .../apache/lucene/misc/CollectorMemoryTracker.java |   55 +
 .../search/MemoryAccountingBitsetCollector.java    |   58 +
 .../org/apache/lucene/util/MemoryTracker.java}     |   18 +-
 .../src/java/org/apache/lucene/util/package.html   |   23 +
 .../TestMemoryAccountingBitsetCollector.java       |   69 +
 .../lucene/util/TestCollectorMemoryTracker.java    |   42 +
 .../function/valuesource/MultiBoolFunction.java    |   10 +-
 .../queries}/intervals/BlockIntervalsSource.java   |    2 +-
 .../queries}/intervals/CachingMatchesIterator.java |    2 +-
 .../lucene/queries}/intervals/ConjunctionDISI.java |    2 +-
 .../intervals/ConjunctionIntervalIterator.java     |    2 +-
 .../intervals/ConjunctionIntervalsSource.java      |    2 +-
 .../intervals/ContainedByIntervalsSource.java      |    2 +-
 .../intervals/ContainingIntervalsSource.java       |    2 +-
 .../intervals/DifferenceIntervalsSource.java       |    2 +-
 .../queries}/intervals/DisiPriorityQueue.java      |    2 +-
 .../lucene/queries}/intervals/DisiWrapper.java     |    2 +-
 .../intervals/DisjunctionDISIApproximation.java    |    2 +-
 .../intervals/DisjunctionIntervalsSource.java      |    2 +-
 .../lucene/queries}/intervals/Disjunctions.java    |    6 +-
 .../intervals/ExtendedIntervalIterator.java        |    2 +-
 .../intervals/ExtendedIntervalsSource.java         |    2 +-
 .../intervals/FilteredIntervalsSource.java         |    2 +-
 .../intervals/FilteringIntervalIterator.java       |    2 +-
 .../intervals/FixedFieldIntervalsSource.java       |    2 +-
 .../lucene/queries}/intervals/IntervalFilter.java  |    2 +-
 .../queries}/intervals/IntervalIterator.java       |    2 +-
 .../lucene/queries}/intervals/IntervalMatches.java |    2 +-
 .../intervals/IntervalMatchesIterator.java         |    2 +-
 .../lucene/queries}/intervals/IntervalQuery.java   |    2 +-
 .../queries}/intervals/IntervalScoreFunction.java  |    2 +-
 .../lucene/queries}/intervals/IntervalScorer.java  |    2 +-
 .../lucene/queries}/intervals/Intervals.java       |   16 +-
 .../lucene/queries}/intervals/IntervalsSource.java |    2 +-
 .../MinimizingConjunctionMatchesIterator.java      |    2 +-
 .../MinimumShouldMatchIntervalsSource.java         |    2 +-
 .../intervals/MultiTermIntervalsSource.java        |    8 +-
 .../intervals/NonOverlappingIntervalsSource.java   |    2 +-
 .../intervals/NotContainedByIntervalsSource.java   |    2 +-
 .../intervals/NotContainingIntervalsSource.java    |    2 +-
 .../queries}/intervals/OffsetIntervalsSource.java  |    2 +-
 .../queries}/intervals/OrderedIntervalsSource.java |    2 +-
 .../intervals/OverlappingIntervalsSource.java      |    2 +-
 .../PayloadFilteredTermIntervalsSource.java        |    2 +-
 .../queries}/intervals/RelativeIterator.java       |    2 +-
 .../queries}/intervals/TermIntervalsSource.java    |    2 +-
 .../intervals/UnorderedIntervalsSource.java        |    2 +-
 .../lucene/queries/intervals/package-info.java     |   68 +
 .../apache/lucene/queries/mlt/MoreLikeThis.java    |    5 +-
 .../lucene/queries/function/TestValueSources.java  |   26 +
 .../intervals/TestDisjunctionRewrites.java         |    4 +-
 .../queries}/intervals/TestIntervalQuery.java      |    2 +-
 .../lucene/queries}/intervals/TestIntervals.java   |   13 +-
 .../intervals/TestPayloadFilteredInterval.java     |    2 +-
 .../queries}/intervals/TestSimplifications.java    |    2 +-
 .../queryparser/classic/QueryParserBase.java       |    4 +-
 .../standard/builders/AnyQueryNodeBuilder.java     |    2 +-
 .../standard/builders/BooleanQueryNodeBuilder.java |    5 +-
 .../precedence/TestPrecedenceQueryParser.java      |    7 +-
 .../flexible/standard/TestQPHelper.java            |    6 +-
 .../queryparser/util/QueryParserTestBase.java      |    6 +-
 .../apache/lucene/document/LatLonShapeQuery.java   |   39 +-
 .../java/org/apache/lucene/search/BM25FQuery.java  |   29 +-
 .../org/apache/lucene/search/CoveringQuery.java    |   18 +-
 .../lucene/search/DocValuesNumbersQuery.java       |   12 +-
 .../apache/lucene/search/DocValuesTermsQuery.java  |   12 +-
 .../IndexSortSortedNumericDocValuesRangeQuery.java |  301 ++++
 .../java/org/apache/lucene/search/LongHashSet.java |   11 +-
 .../apache/lucene/search/TermAutomatonQuery.java   |   16 +-
 .../lucene/search/intervals/package-info.java      |   68 -
 .../lucene/document/BaseLatLonShapeTestCase.java   |   19 +
 ...tIndexSortSortedNumericDocValuesRangeQuery.java |  446 +++++
 .../lucene/spatial3d/PointInGeo3DShapeQuery.java   |   14 +-
 .../document/Completion50PostingsFormat.java       |   15 +-
 .../suggest/document/CompletionFieldsProducer.java |    5 +-
 .../suggest/document/CompletionPostingsFormat.java |   34 +-
 .../suggest/document/CompletionsTermsReader.java   |    8 +-
 .../search/suggest/document/ContextQuery.java      |   20 +-
 .../search/suggest/document/NRTSuggester.java      |   36 +-
 .../suggest/document/NRTSuggesterBuilder.java      |    5 +-
 .../search/suggest/document/TestSuggestField.java  |    5 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java    |   23 +
 .../lucene/search/BaseRangeFieldQueryTestCase.java |   29 +
 .../util/TestRuleSetupAndRestoreInstanceEnv.java   |    6 +-
 solr/CHANGES.txt                                   |   37 +
 solr/bin/solr.in.cmd                               |    5 +
 solr/bin/solr.in.sh                                |    5 +
 .../function/field/AbstractAnalyticsFieldTest.java |    5 +-
 .../legacy/LegacyAbstractAnalyticsCloudTest.java   |    1 -
 .../dataimport/TestContentStreamDataSource.java    |    5 +-
 .../dataimport/TestHierarchicalDocBuilder.java     |    5 +-
 .../handler/dataimport/TestJdbcDataSource.java     |    4 +-
 .../TestSolrEntityProcessorEndToEnd.java           |   10 +-
 .../handler/dataimport/TestZKPropertiesWriter.java |   14 +-
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java    |    5 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |   17 +-
 .../prometheus/scraper/SolrCloudScraperTest.java   |    5 +-
 .../scraper/SolrStandaloneScraperTest.java         |   10 +-
 .../solr/cloud/autoscaling/ScheduledTrigger.java   |    9 +-
 .../java/org/apache/solr/core/BlobRepository.java  |   54 +-
 .../apache/solr/core/CachingDirectoryFactory.java  |  106 +-
 .../src/java/org/apache/solr/core/CloudConfig.java |   20 +-
 .../org/apache/solr/core/ConfigSetProperties.java  |    4 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  213 +--
 .../src/java/org/apache/solr/core/NodeConfig.java  |    3 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |    8 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |  591 +++---
 .../solr/handler/admin/CollectionsHandler.java     |  124 +-
 .../apache/solr/handler/admin/SolrEnvironment.java |   94 +
 .../solr/handler/admin/SystemInfoHandler.java      |   11 +
 .../solr/handler/component/QueryComponent.java     |   29 +-
 .../apache/solr/handler/component/StatsField.java  |   12 +-
 .../apache/solr/parser/SolrQueryParserBase.java    |    3 +-
 .../java/org/apache/solr/query/SolrRangeQuery.java |   17 +-
 .../org/apache/solr/schema/AbstractEnumField.java  |   14 +-
 .../java/org/apache/solr/schema/BinaryField.java   |    8 +
 .../src/java/org/apache/solr/schema/BoolField.java |    7 +
 .../src/java/org/apache/solr/schema/UUIDField.java |    8 +
 .../solr/search/CollapsingQParserPlugin.java       |   41 +-
 .../src/java/org/apache/solr/search/QParser.java   |    9 +-
 .../java/org/apache/solr/search/QueryUtils.java    |    3 +-
 .../TopGroupsShardResponseProcessor.java           |   29 +-
 .../MainEndResultTransformer.java                  |   45 +-
 .../SimpleEndResultTransformer.java                |   35 +-
 .../org/apache/solr/update/SolrIndexConfig.java    |   10 +
 .../conf/solrconfig.snippet.randomindexconfig.xml  |    1 +
 .../solr/configsets/_default/conf/solrconfig.xml   |    9 +
 .../org/apache/solr/TestDistributedGrouping.java   |   42 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |   15 +-
 .../test/org/apache/solr/TestTolerantSearch.java   |   18 +-
 .../embedded/TestEmbeddedSolrServerSchemaAPI.java  |    6 +-
 .../org/apache/solr/cloud/CleanupOldIndexTest.java |    2 +-
 .../apache/solr/cloud/CreateRoutedAliasTest.java   |    5 +-
 .../apache/solr/cloud/DistributedQueueTest.java    |    9 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java      |    6 +-
 .../solr/cloud/MissingSegmentRecoveryTest.java     |    4 +
 .../OverseerCollectionConfigSetProcessorTest.java  |   12 +-
 .../test/org/apache/solr/cloud/RecoveryZkTest.java |   23 +-
 .../apache/solr/cloud/ReindexCollectionTest.java   |    5 +-
 .../org/apache/solr/cloud/SolrCLIZkUtilsTest.java  |    6 +-
 .../solr/cloud/SystemCollectionCompatTest.java     |    5 +-
 .../apache/solr/cloud/TestCloudConsistency.java    |    8 +-
 .../apache/solr/cloud/TestCloudDeleteByQuery.java  |   30 +-
 .../TestCloudPhrasesIdentificationComponent.java   |    5 +-
 .../solr/cloud/TestCloudPseudoReturnFields.java    |    5 +-
 .../solr/cloud/TestCloudSearcherWarming.java       |    9 +-
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |    5 +-
 .../solr/cloud/TestConfigSetsAPIExclusivity.java   |    5 +-
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |   10 +-
 .../org/apache/solr/cloud/TestDistributedMap.java  |    6 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java    |    2 -
 .../solr/cloud/TestPullReplicaErrorHandling.java   |    8 +-
 .../apache/solr/cloud/TestRandomFlRTGCloud.java    |    5 +-
 .../apache/solr/cloud/TestSSLRandomization.java    |    2 -
 .../cloud/TestSolrCloudWithDelegationTokens.java   |   14 +-
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |   12 +-
 .../org/apache/solr/cloud/TestStressLiveNodes.java |    6 +-
 .../test/org/apache/solr/cloud/TestZkChroot.java   |    7 +-
 .../test/org/apache/solr/cloud/ZkFailoverTest.java |   11 -
 .../ConcurrentDeleteAndCreateCollectionTest.java   |    5 +-
 .../collections/TestHdfsCloudBackupRestore.java    |    3 -
 .../cloud/autoscaling/IndexSizeTriggerTest.java    |    2 +-
 .../autoscaling/sim/TestSimComputePlanAction.java  |    5 +
 .../autoscaling/sim/TestSimExecutePlanAction.java  |    5 +
 .../solr/cloud/cdcr/CdcrOpsAndBoundariesTest.java  |   12 +-
 .../solr/cloud/cdcr/CdcrWithNodesRestartsTest.java |   12 +-
 .../src/test/org/apache/solr/core/TestConfig.java  |    7 +-
 .../org/apache/solr/handler/TestCSVLoader.java     |    5 +-
 .../solr/handler/TestReplicationHandler.java       |   74 +-
 .../solr/handler/TestReplicationHandlerBackup.java |   12 +-
 .../TestReplicationHandlerDiskOverFlow.java        |   22 +-
 .../org/apache/solr/handler/TestRestoreCore.java   |   12 +-
 .../solr/handler/admin/DaemonStreamApiTest.java    |    5 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |    8 +-
 .../solr/handler/admin/SolrEnvironmentTest.java    |   73 +
 .../component/DistributedDebugComponentTest.java   |   18 +-
 .../solr/highlight/TestUnifiedSolrHighlighter.java |    5 +
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |    4 +-
 .../solr/legacy/TestNumericRangeQuery32.java       |   15 +-
 .../solr/legacy/TestNumericRangeQuery64.java       |   15 +-
 .../solr/metrics/SolrCoreMetricManagerTest.java    |    8 +-
 .../solr/metrics/SolrMetricsIntegrationTest.java   |    4 +
 .../metrics/reporters/SolrJmxReporterTest.java     |    3 +
 .../analysis/TestManagedStopFilterFactory.java     |    6 +-
 .../analysis/TestManagedSynonymFilterFactory.java  |   11 +-
 .../TestManagedSynonymGraphFilterFactory.java      |   10 +-
 .../solr/schema/TestManagedSchemaThreadSafety.java |    6 +-
 .../solr/schema/TestUseDocValuesAsStored.java      |    1 -
 .../org/apache/solr/search/QueryParsingTest.java   |   46 +-
 .../solr/search/TestCollapseQParserPlugin.java     |   51 +-
 .../solr/search/TestExtendedDismaxParser.java      |   76 +-
 .../apache/solr/search/TestSolrQueryParser.java    |    5 +-
 .../search/facet/TestCloudJSONFacetJoinDomain.java |    5 +-
 .../solr/search/facet/TestCloudJSONFacetSKG.java   |    5 +-
 .../apache/solr/search/function/TestOrdValues.java |    4 +-
 .../solr/search/join/BlockJoinFacetRandomTest.java |    8 +-
 .../solr/search/mlt/CloudMLTQParserTest.java       |    4 +-
 .../solr/security/AuditLoggerIntegrationTest.java  |    4 +-
 .../solr/security/AuditLoggerPluginTest.java       |    7 +-
 .../solr/security/BasicAuthIntegrationTest.java    |   15 +-
 .../solr/security/BasicAuthStandaloneTest.java     |    5 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |    5 +-
 .../security/SolrLogAuditLoggerPluginTest.java     |    7 +-
 .../apache/solr/servlet/ResponseHeaderTest.java    |    4 +-
 .../solr/store/blockcache/BlockDirectoryTest.java  |    5 +-
 .../apache/solr/uninverting/TestFieldCache.java    |   12 +-
 .../solr/uninverting/TestLegacyFieldCache.java     |   12 +-
 .../solr/uninverting/TestNumericTerms32.java       |   14 +-
 .../solr/uninverting/TestNumericTerms64.java       |   14 +-
 .../org/apache/solr/update/AddBlockUpdateTest.java |    7 +-
 .../apache/solr/update/MaxSizeAutoCommitTest.java  |    6 +-
 .../apache/solr/update/SolrIndexConfigTest.java    |    2 +
 .../CategoryRoutedAliasUpdateProcessorTest.java    |   10 +-
 .../ClassificationUpdateProcessorTest.java         |   15 +-
 .../ParsingFieldUpdateProcessorsTest.java          |  189 +-
 .../TimeRoutedAliasUpdateProcessorTest.java        |    4 +-
 .../test/org/apache/solr/util/AuthToolTest.java    |    5 +-
 .../test/org/apache/solr/util/UtilsToolTest.java   |    5 +-
 .../solr/configsets/_default/conf/solrconfig.xml   |    9 +
 .../conf/solrconfig.xml                            |    9 +
 solr/solr-ref-guide/src/highlighting.adoc          |   11 +-
 .../src/indexconfig-in-solrconfig.adoc             |   11 +
 solr/solr-ref-guide/src/json-facet-api.adoc        |    2 +-
 .../src/rule-based-authorization-plugin.adoc       |   21 +-
 .../src/stream-decorator-reference.adoc            |    2 +-
 .../src/taking-solr-to-production.adoc             |    9 +
 .../java/org/apache/solr/client/solrj/io/Lang.java |    1 +
 .../solr/client/solrj/io/eval/KmeansEvaluator.java |    6 +-
 .../solrj/io/eval/ProjectToBorderEvaluator.java    |   65 +
 .../solr/client/solrj/io/stream/DaemonStream.java  |   38 +-
 .../solr/client/solrj/io/stream/ZplotStream.java   |   28 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |  258 +--
 .../solr/autoscaling/testEmptyCollection.json      |   27 +
 .../client/solrj/cloud/autoscaling/TestPolicy.java |   68 +
 .../solrj/impl/HttpSolrClientConPoolTest.java      |    6 +-
 .../impl/HttpSolrClientSSLAuthConPoolTest.java     |    3 -
 .../org/apache/solr/client/solrj/io/TestLang.java  |    2 +-
 .../client/solrj/io/stream/MathExpressionTest.java |   40 +-
 .../common/cloud/TestCollectionStateWatchers.java  |    4 +-
 .../common/cloud/TestDocCollectionWatcher.java     |    4 +-
 .../solr/common/cloud/TestZkConfigManager.java     |    4 +-
 .../src/java/org/apache/solr/SolrTestCase.java     |   30 +
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |   10 +-
 .../java/org/apache/solr/util/SSLTestConfig.java   |   60 +-
 .../org/apache/solr/util/TestSSLTestConfig.java    |   87 +
 solr/webapp/web/css/angular/common.css             |    8 +-
 solr/webapp/web/index.html                         |    4 +-
 solr/webapp/web/js/angular/app.js                  |   12 +
 339 files changed, 10174 insertions(+), 2373 deletions(-)