You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/07/04 12:09:05 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14021
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-14021
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit e570e9f8f4529bfc247a501a0385fb4c72ced8d6
Merge: fa70b01 04d9b52
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Sat Jul 4 17:38:30 2020 +0530
Merge branch 'master' into jira/solr-14021
lucene/ivy-versions.properties | 2 +-
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/handler/export/ExportBuffers.java | 14 +++++++-------
.../org/apache/solr/handler/export/ExportWriterStream.java | 2 +-
.../org/apache/solr/handler/export/TestExportWriter.java | 10 +++-------
solr/licenses/org.restlet-2.4.0.jar.sha1 | 1 -
solr/licenses/org.restlet-2.4.3.jar.sha1 | 1 +
solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1 | 1 -
solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1 | 1 +
versions.lock | 4 ++--
versions.props | 2 +-
11 files changed, 19 insertions(+), 21 deletions(-)
diff --cc solr/CHANGES.txt
index fe13e4c,c4b21f7..60cc417
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -447,9 -447,8 +447,11 @@@ Other Change
* SOLR-14066: Data Import Handler is deprecated. It is scheduled to be removed as of 9.0 and a community supported
package for the same may now be used instead. (Ishan Chattopadhyaya, janhoy)
+* SOLR-14021: HDFS support is deprecated. It is scheduled to be removed as of 9.0. Please see JIRA for more details.
+ (Joel Bernstein, Ishan Chattopadhyaya)
+
+ * SOLR-14603: Upgrade Restlet to 2.4.3 (marcussorealheis)
+
================== 8.5.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.