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

[sh...@apache.org]

Author: shalin
Date: Wed Mar 19 05:45:28 2014
New Revision: 1579143

URL: http://svn.apache.org/r1579143
Log:
Move backported fix to the right version in changelog

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=1579143&r1=1579142&r2=1579143&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 19 05:45:28 2014
@@ -177,9 +177,6 @@ Bug Fixes
 * SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery'
   state. (shalin)
 
-* SOLR-5866: UpdateShardHandler needs to use the system default scheme registry to
-  properly handle https via javax.net.ssl.* properties. (Steve Davids via shalin)
-
 * SOLR-5550: shards.info is not returned by a short circuited distributed query.
   (Timothy Potter, shalin)
 
@@ -279,6 +276,9 @@ Bug Fixes
 * SOLR-5867: OverseerCollectionProcessor isn't properly generating https urls in some
   cases. (Steve Davids via shalin)
 
+* SOLR-5866: UpdateShardHandler needs to use the system default scheme registry to
+  properly handle https via javax.net.ssl.* properties. (Steve Davids via shalin)
+
 ==================  4.7.0 ==================
 
 Versions of Major Components