You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/10/31 14:06:30 UTC
[37/37] lucene-solr:jira/solr-8542-v2: Merge branch 'master' into
jira/solr-8542-v2
Merge branch 'master' into jira/solr-8542-v2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7a3338a7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a3338a7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a3338a7
Branch: refs/heads/jira/solr-8542-v2
Commit: 7a3338a79b5be6ac57856acff07a61b5a48b1d35
Parents: f3aca41 c444658
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Oct 31 13:50:10 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Oct 31 13:50:10 2016 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 10 +
.../lucene/analysis/custom/CustomAnalyzer.java | 2 +-
.../lucene/collation/CollationKeyAnalyzer.java | 2 +-
.../lucene54/Lucene54DocValuesProducer.java | 2 +-
.../lucene54/TestLucene54DocValuesFormat.java | 27 +
.../org/apache/lucene/analysis/Analyzer.java | 9 +-
.../apache/lucene/analysis/AnalyzerWrapper.java | 50 +-
.../analysis/DelegatingAnalyzerWrapper.java | 14 +-
.../org/apache/lucene/index/MultiDocValues.java | 10 +-
.../java/org/apache/lucene/util/Constants.java | 18 +-
.../java/org/apache/lucene/util/Version.java | 7 +
.../analysis/TestDelegatingAnalyzerWrapper.java | 107 ++
.../apache/lucene/index/TestMultiDocValues.java | 19 +-
.../lucene/analysis/MockBytesAnalyzer.java | 2 +-
lucene/tools/forbiddenApis/solr.txt | 20 +
solr/CHANGES.txt | 64 +-
solr/bin/solr | 39 +-
solr/bin/solr.cmd | 1 -
solr/bin/solr.in.sh | 6 +
.../analytics/accumulator/BasicAccumulator.java | 2 +-
.../StatsCollectorSupplierFactory.java | 2 +-
.../solr/handler/dataimport/DIHCache.java | 16 +-
.../solr/handler/dataimport/EventListener.java | 2 +-
.../dataimport/XPathEntityProcessor.java | 52 +-
.../handler/dataimport/XPathRecordReader.java | 15 +-
.../AbstractDataImportHandlerTestCase.java | 14 +-
.../dataimport/MockStringDataSource.java | 54 +
.../solr/handler/dataimport/TestDocBuilder.java | 129 +-
.../dataimport/TestXPathRecordReader.java | 15 +-
.../hadoop/morphline/MorphlineMapRunner.java | 5 +-
.../solr/morphlines/cell/SolrCellBuilder.java | 14 +-
.../solr/SanitizeUnknownSolrFieldsBuilder.java | 17 +-
.../solr/morphlines/solr/SolrLocator.java | 5 +-
.../morphlines/solr/TokenizeTextBuilder.java | 8 +-
.../solr/AbstractSolrMorphlineTestBase.java | 8 +-
.../solr/SolrMorphlineZkAvroTest.java | 9 +-
.../apache/solr/analysis/TokenizerChain.java | 2 +-
.../client/solrj/embedded/JettySolrRunner.java | 10 +
.../org/apache/solr/cloud/DistributedQueue.java | 4 +-
.../java/org/apache/solr/cloud/rule/Snitch.java | 34 -
.../org/apache/solr/core/CoreContainer.java | 4 +-
.../src/java/org/apache/solr/core/SolrCore.java | 10 +-
.../apache/solr/core/backup/BackupManager.java | 11 +-
.../repository/BackupRepositoryFactory.java | 9 +-
.../backup/repository/HdfsBackupRepository.java | 8 +-
.../repository/LocalFileSystemRepository.java | 3 +-
.../snapshots/SolrSnapshotMetaDataManager.java | 6 +-
.../apache/solr/handler/OldBackupDirectory.java | 7 +-
.../org/apache/solr/handler/SnapShooter.java | 8 +-
.../org/apache/solr/handler/StreamHandler.java | 32 +-
.../solr/handler/admin/SecurityConfHandler.java | 4 +
.../handler/admin/SecurityConfHandlerLocal.java | 5 +-
.../component/MoreLikeThisComponent.java | 2 +-
.../solr/response/JSONResponseWriter.java | 173 ++-
.../solr/response/SortingResponseWriter.java | 27 +-
.../solr/search/ExtendedDismaxQParser.java | 25 +-
.../apache/solr/search/SolrIndexSearcher.java | 14 +-
.../solr/search/facet/FacetProcessor.java | 63 +-
.../apache/solr/search/facet/FacetRequest.java | 13 +-
.../apache/solr/update/MergeIndexesCommand.java | 12 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 2 +-
.../configsets/cloud-dynamic/conf/schema.xml | 2 +
.../solr/configsets/cloud-hdfs/conf/schema.xml | 28 +
.../configsets/cloud-hdfs/conf/solrconfig.xml | 50 +
.../cloud-minimal-jmx/conf/schema.xml | 28 +
.../cloud-minimal-jmx/conf/solrconfig.xml | 50 +
.../solrj/embedded/TestJettySolrRunner.java | 4 +-
.../cloud/CollectionTooManyReplicasTest.java | 301 ++--
.../cloud/CollectionsAPIDistributedZkTest.java | 1303 +++++-------------
.../solr/cloud/CreateCollectionCleanupTest.java | 6 +-
.../apache/solr/cloud/CustomCollectionTest.java | 491 ++-----
.../apache/solr/cloud/DistributedQueueTest.java | 13 +-
.../apache/solr/cloud/KerberosTestServices.java | 14 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 1 +
.../org/apache/solr/cloud/RecoveryZkTest.java | 166 +--
.../org/apache/solr/cloud/ShardSplitTest.java | 6 +-
.../solr/cloud/TestClusterProperties.java | 45 +
.../cloud/TestDeleteCollectionOnDownNodes.java | 65 +
.../HdfsCollectionsAPIDistributedZkTest.java | 33 +-
.../solr/cloud/hdfs/HdfsRecoveryZkTest.java | 22 +-
.../solr/core/TestCorePropertiesReload.java | 74 +
.../org/apache/solr/core/TestLazyCores.java | 16 +-
.../handler/admin/CoreAdminHandlerTest.java | 4 +-
.../apache/solr/response/JSONWriterTest.java | 102 +-
.../response/TestSortingResponseWriter.java | 16 +-
.../solr/schema/ChangedSchemaMergeTest.java | 8 +-
.../org/apache/solr/schema/TestBinaryField.java | 4 +-
.../solr/search/facet/TestJsonFacets.java | 129 +-
.../solr/security/BasicAuthStandaloneTest.java | 5 +-
.../security/TestAuthorizationFramework.java | 4 +-
.../org/apache/solr/client/solrj/SolrQuery.java | 248 ++++
.../client/solrj/io/stream/ExecutorStream.java | 224 +++
.../solrj/request/CollectionAdminRequest.java | 16 +-
.../client/solrj/request/CoreAdminRequest.java | 6 +
.../client/solrj/request/UpdateRequest.java | 8 +
.../client/solrj/response/QueryResponse.java | 8 +
.../org/apache/solr/common/cloud/Slice.java | 10 +
.../solr/common/params/MoreLikeThisParams.java | 3 +
.../solr/client/solrj/SolrExampleTests.java | 21 +-
.../apache/solr/client/solrj/SolrQueryTest.java | 25 +
.../solrj/io/stream/StreamExpressionTest.java | 152 +-
.../cloud/TestCollectionStateWatchers.java | 2 +-
.../solr/common/cloud/TestZkConfigManager.java | 10 +-
.../java/org/apache/solr/SolrTestCaseHS.java | 5 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 9 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 39 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 6 +-
.../org/apache/solr/cloud/ZkTestServer.java | 11 +-
108 files changed, 2983 insertions(+), 2074 deletions(-)
----------------------------------------------------------------------