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

[ma...@apache.org]

Author: markrmiller
Date: Mon Dec 30 01:14:13 2013
New Revision: 1554124

URL: http://svn.apache.org/r1554124
Log:
SOLR-5503: Move CHANGES entry 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=1554124&r1=1554123&r2=1554124&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Dec 30 01:14:13 2013
@@ -125,9 +125,6 @@ Bug Fixes
   a delta-import is run first before any full-imports.
   (Sebastien Lorber, Arcadius Ahouansou via shalin)
 
-* SOLR-5503: Retry 'forward to leader' requests less aggressively - rather 
-  than on IOException and status 500, ConnectException. (Mark Miller)
-
 * SOLR-5494: CoreContainer#remove throws NPE rather than returning null when
   a SolrCore does not exist in core discovery mode. (Mark Miller)
   
@@ -288,7 +285,10 @@ Bug Fixes
 
 * SOLR-4709: The core reload after replication if config files have changed
   can fail due to a race condition. (Mark Miller, Hossman))
-  
+
+* SOLR-5503: Retry 'forward to leader' requests less aggressively - rather 
+  than on IOException and status 500, ConnectException. (Mark Miller)
+    
 Optimizations
 ----------------------