svn commit: r1618285 - /lucene/dev/trunk/solr/CHANGES.txt

[ho...@apache.org]

Author: hossman
Date: Fri Aug 15 21:54:10 2014
New Revision: 1618285

URL: http://svn.apache.org/r1618285
Log:
SOLR-5868: fixing botched changes.txt placement/merge from 4.9

Modified:
    lucene/dev/trunk/solr/CHANGES.txt

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1618285&r1=1618284&r2=1618285&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Aug 15 21:54:10 2014
@@ -86,9 +86,6 @@ Other Changes
 * SOLR-5936: Removed deprecated non-Trie-based numeric & date field types.
   (Steve Rowe)
 
-* SOLR-5868: HttpClient should be configured to use ALLOW_ALL_HOSTNAME hostname
-  verifier to simplify SSL setup. (Steve Davids via Mark Miller)
-
 * SOLR-6169: Finish removal of CoreAdminHandler handleAlias action begun in 4.9 
   (Alan Woodward)
 
@@ -563,6 +560,10 @@ Other Changes
 * SOLR-6128: Removed deprecated analysis factories and fieldTypes from the example
   schema.xml (hossman)
 
+* SOLR-5868: HttpClient should be configured to use ALLOW_ALL_HOSTNAME hostname
+  verifier to simplify SSL setup. (Steve Davids via Mark Miller)
+
+
 Optimizations
 ----------------------