From e01eefe9657ca543500547427f55e8d451efbc92 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Thu, 12 Jul 2018 11:02:21 +0200
Subject: [PATCH] Add version 6.6.5.

---
 lucene/CHANGES.txt |  3 +++
 solr/CHANGES.txt   | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index fe36f3ad82d..42a540521c5 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -1055,6 +1055,9 @@ Other
   that are trivially replaced by LeafReader.terms() and MultiFields.getTerms()
   (David Smiley)
 
+======================= Lucene 6.6.5 =======================
+(No Changes)
+
 ======================= Lucene 6.6.4 =======================
 (No Changes)
 
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f0a65afbf5c..4af114933cf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -2327,6 +2327,31 @@ Other Changes
 
 * SOLR-11324: Clean up mention of trie fields in documentation and source comments. (Steve Rowe)
 
+==================  6.6.5 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Versions of Major Components
+---------------------
+Apache Tika 1.13
+Carrot2 3.15.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.10
+Jetty 9.3.14.v20161028
+
+New Features
+----------------------
+
+* SOLR-12530: Ability to disable configset upload via -Dconfigset.upload.enabled=false startup parameter
+  (Ishan Chattopadhyaya)
+
+Bug Fixes
+----------------------
+
+* SOLR-12450: Don't allow referal to external resources in various config files (CVE-2018-8026).
+  (Yuyang Xiao, Uwe Schindler)
+
 ==================  6.6.4 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.