You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/02/15 20:47:17 UTC

[05/50] lucene-solr:master: Merge branch 'apache-https-master' into jira/solr-8593

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/b2fe7a49
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b2fe7a49
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b2fe7a49

Branch: refs/heads/master
Commit: b2fe7a4945e935dda295fb141ea7fd78bc9e80dc
Parents: 01f0ef4 417e29a
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Oct 31 10:14:31 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Oct 31 10:14:31 2016 -0500

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   7 +
 .../lucene54/Lucene54DocValuesProducer.java     |   2 +-
 .../lucene54/TestLucene54DocValuesFormat.java   |  27 +++
 .../org/apache/lucene/index/MultiDocValues.java |  10 +-
 .../java/org/apache/lucene/util/Constants.java  |  18 +-
 .../java/org/apache/lucene/util/Version.java    |   7 +
 .../apache/lucene/index/TestMultiDocValues.java |  19 +-
 lucene/tools/forbiddenApis/solr.txt             |  20 +++
 solr/CHANGES.txt                                |  44 +++++
 solr/bin/solr.cmd                               |   3 +-
 .../analytics/accumulator/BasicAccumulator.java |   2 +-
 .../StatsCollectorSupplierFactory.java          |   2 +-
 .../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 +-
 .../org/apache/solr/cloud/DistributedQueue.java |   4 +-
 .../org/apache/solr/core/CoreContainer.java     |   4 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   6 +-
 .../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 +-
 .../solr/handler/admin/SecurityConfHandler.java |   4 +
 .../handler/admin/SecurityConfHandlerLocal.java |   4 +-
 .../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 +-
 .../solrj/embedded/TestJettySolrRunner.java     |   4 +-
 .../apache/solr/cloud/DistributedQueueTest.java |  13 +-
 .../apache/solr/cloud/KerberosTestServices.java |  14 +-
 .../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       |  37 ++++
 .../solr/security/BasicAuthStandaloneTest.java  |   4 +
 .../security/TestAuthorizationFramework.java    |   4 +-
 .../cloud/TestCollectionStateWatchers.java      |   2 +-
 .../solr/common/cloud/TestZkConfigManager.java  |  10 +-
 .../java/org/apache/solr/SolrTestCaseHS.java    |   4 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   9 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   4 +-
 .../org/apache/solr/cloud/ZkTestServer.java     |  11 +-
 56 files changed, 677 insertions(+), 217 deletions(-)
----------------------------------------------------------------------