add 8.6 section to master branch's MERGE-CONFLICTS.txt for consistency

This commit is contained in:
Robert Muir 2020-03-06 05:52:26 -05:00
parent 624f5a3c2f
commit 4360fa7506
No known key found for this signature in database
GPG Key ID: 817AE1DD322D7ECA
1 changed files with 27 additions and 0 deletions

View File

@ -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