From b907bf40cff0c692bd8f04f092a5e5f821b41512 Mon Sep 17 00:00:00 2001
From: Steve Rowe <sarowe@apache.org>
Date: Fri, 6 Oct 2017 17:49:36 -0400
Subject: [PATCH] Sync 7.0.1 changes

---
 lucene/CHANGES.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e72d4b9fd5a..68f8fc71bbc 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -120,7 +120,11 @@ Other
 
 
 ======================= Lucene 7.0.1 =======================
-(No Changes)
+
+Bug Fixes
+
+* LUCENE-7957: ConjunctionScorer.getChildren was failing to return all
+  child scorers (Adrien Grand, Mike McCandless)
 
 ======================= Lucene 7.0.0 =======================