svn commit: r1579144 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt

[sh...@apache.org]

Author: shalin
Date: Wed Mar 19 05:48:02 2014
New Revision: 1579144

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

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1579144&r1=1579143&r2=1579144&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Mar 19 05:48:02 2014
@@ -124,9 +124,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)
 
@@ -226,6 +223,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