From ef079cc3b4f3dfb6750456b2d276c1212d8100a5 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Mon, 21 Aug 2017 00:22:28 +0200
Subject: [PATCH] Sync changes

---
 solr/CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a910fc60c2b..02690261623 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -896,6 +896,12 @@ Bug Fixes
 
 * SOLR-11069: CDCR bootstrapping can get into an infinite loop when a core is reloaded (Amrit Sarkar, Erick Erickson)
 
+* SOLR-11221: SolrJmxReporter broken on core reload. This resulted in some or most metrics not being reported
+  via JMX after core reloads, depending on timing. (ab)
+
+* SOLR-11261, SOLR-10966: Upgrade to Hadoop 2.7.4 to fix incompatibility with Java 9.
+  (Uwe Schindler)
+
 ==================  6.6.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.