From be2a1ea180c1c5926026db54e6df80e4c5bcaff9 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Fri, 31 Mar 2017 18:10:27 +0100
Subject: [PATCH] =?UTF-8?q?LUCENE-7763:=20Remove=20outdated=20comment=20in?=
 =?UTF-8?q?=20IndexWriterConfig.setIndexSort=20javadocs.=20(=E9=A9=AC?=
 =?UTF-8?q?=E5=8F=AF=E9=98=B3=20via=20Christine=20Poerschke)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lucene/CHANGES.txt                                           | 5 +++++
 .../src/java/org/apache/lucene/index/IndexWriterConfig.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e0827e78e90..833fd3c9ef3 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -106,6 +106,11 @@ Bug Fixes
 * LUCENE-7755: Fixed join queries to not reference IndexReaders, as it could
   cause leaks if they are cached. (Adrien Grand)
 
+Other
+
+* LUCENE-7763: Remove outdated comment in IndexWriterConfig.setIndexSort javadocs.
+  (马可阳 via Christine Poerschke)
+
 ======================= Lucene 6.5.0 =======================
 
 API Changes
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
index 1e1e795d50b..0fdbc3e8652 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
@@ -466,7 +466,7 @@ public final class IndexWriterConfig extends LiveIndexWriterConfig {
                                                                                      SortField.Type.FLOAT);
 
   /**
-   * Set the {@link Sort} order to use when merging segments.  Note that newly flushed segments will remain unsorted.
+   * Set the {@link Sort} order to use when merging segments.
    */
   public IndexWriterConfig setIndexSort(Sort sort) {
     for(SortField sortField : sort.getSort()) {