From f6ca662f33ee2b336b6ae6d33ab54a4bb40e6833 Mon Sep 17 00:00:00 2001
From: Ishan Chattopadhyaya <ishan@apache.org>
Date: Wed, 22 Jan 2020 11:21:53 +0530
Subject: [PATCH] Synchronizing 8.4.1 changes

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

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index dfb1986d269..8a84b018815 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -269,8 +269,14 @@ Upgrade Notes
 Bug Fixes
 ----------------------
 
+* SOLR-14106: Cleanup Jetty SslContextFactory usage (Ryan Rockenbaugh, Jan Hoydahl, Kevin Risden)
+
+* SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} (janhoy)
+
 * SOLR-14165: SolrResponse serialVersionUID has changed in a backward incompatible way (Andy Webb via noble)
 
+* SOLR-14163: SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION needs to work with Jetty server/client SSL contexts (Kevin Risden)
+
 Improvements
 ---------------------