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

[ma...@apache.org]

Author: markrmiller
Date: Sun Dec 29 00:53:05 2013
New Revision: 1553986

URL: http://svn.apache.org/r1553986
Log:
SOLR-5496: Move CHANGES to 4.6.1

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=1553986&r1=1553985&r2=1553986&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sun Dec 29 00:53:05 2013
@@ -128,10 +128,6 @@ Bug Fixes
   a delta-import is run first before any full-imports.
   (Sebastien Lorber, Arcadius Ahouansou via shalin)
 
-* SOLR-5496: We should share an http connection manager across non search 
-  HttpClients and ensure all http connection managers get shutdown.
-  (Mark Miller)
-
 * SOLR-5503: Retry 'forward to leader' requests less aggressively - rather 
   than on IOException and status 500, ConnectException. (Mark Miller)
 
@@ -279,6 +275,10 @@ Bug Fixes
 * SOLR-5568 A SolrCore cannot decide to be the leader just because the cluster
   state says no other SolrCore's are active. (Mark Miller)
 
+* SOLR-5496: We should share an http connection manager across non search 
+  HttpClients and ensure all http connection managers get shutdown.
+  (Mark Miller)
+
 Optimizations
 ----------------------