You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2020/03/06 10:52:10 UTC

[lucene-solr] branch master updated: add 8.6 section to master branch's MERGE-CONFLICTS.txt for consistency

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4360fa7  add 8.6 section to master branch's MERGE-CONFLICTS.txt for consistency
4360fa7 is described below

commit 4360fa75064471ca406687795bfdec01b493d8b7
Author: Robert Muir <rm...@apache.org>
AuthorDate: Fri Mar 6 05:52:26 2020 -0500

    add 8.6 section to master branch's MERGE-CONFLICTS.txt for consistency
---
 lucene/CHANGES.txt | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 172ef6a..2a0f19f 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -101,6 +101,33 @@ Other
 * LUCENE-8656: Deprecations in FuzzyQuery and get compiler warnings out of 
   queryparser code (Alan Woodward, Erick Erickson)
 
+======================= Lucene 8.6.0 =======================
+
+API Changes
+---------------------
+
+* LUCENE-9265: SimpleFSDirectory is deprecated in favor of NIOFSDirectory. (Yannick Welsch)
+
+New Features
+---------------------
+(No changes)
+
+Improvements
+---------------------
+(No changes)
+
+Optimizations
+---------------------
+(No changes)
+
+Bug Fixes
+---------------------
+(No changes)
+
+Other
+---------------------
+(No changes)
+
 ======================= Lucene 8.5.0 =======================
 
 API Changes