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 2020/07/06 12:41:42 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-12847-2
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-12847-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 90be2fe0aeb2cef777906d5a89ae3f0892f6c095
Merge: acae47f 4e20986
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Jul 6 14:41:28 2020 +0200
Merge branch 'master' into jira/solr-12847-2
gradle/validation/validate-log-calls.gradle | 5 ++-
lucene/ivy-versions.properties | 2 +-
solr/CHANGES.txt | 5 +++
.../apache/solr/api/CustomContainerPlugins.java | 31 +++++++++++-----
.../org/apache/solr/core/HdfsDirectoryFactory.java | 4 ++
.../backup/repository/HdfsBackupRepository.java | 11 ++++++
.../apache/solr/handler/export/ExportBuffers.java | 14 +++----
.../solr/handler/export/ExportWriterStream.java | 2 +-
.../org/apache/solr/store/hdfs/HdfsDirectory.java | 6 +++
.../org/apache/solr/store/hdfs/HdfsFileWriter.java | 2 +
.../solr/store/hdfs/HdfsLocalityReporter.java | 4 ++
.../apache/solr/store/hdfs/HdfsLockFactory.java | 4 ++
.../org/apache/solr/update/HdfsTransactionLog.java | 2 +
.../java/org/apache/solr/update/HdfsUpdateLog.java | 6 ++-
.../solr/handler/export/TestExportWriter.java | 10 ++---
.../search/facet/TestCloudJSONFacetSKGEquiv.java | 20 ++++++++--
.../solr/search/facet/TestJsonFacetRefinement.java | 43 ++++++++++++++++++++++
solr/licenses/org.restlet-2.4.0.jar.sha1 | 1 -
solr/licenses/org.restlet-2.4.3.jar.sha1 | 1 +
.../org.restlet.ext.servlet-2.4.0.jar.sha1 | 1 -
.../org.restlet.ext.servlet-2.4.3.jar.sha1 | 1 +
.../src/kerberos-authentication-plugin.adoc | 4 +-
solr/solr-ref-guide/src/running-solr-on-hdfs.adoc | 2 +
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 2 +
versions.lock | 4 +-
versions.props | 2 +-
26 files changed, 152 insertions(+), 37 deletions(-)