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

[ma...@apache.org]

Author: markrmiller
Date: Mon Dec 30 00:52:55 2013
New Revision: 1554120

URL: http://svn.apache.org/r1554120
Log:
SOLR-4709: 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=1554120&r1=1554119&r2=1554120&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Dec 30 00:52:55 2013
@@ -116,9 +116,6 @@ Bug Fixes
 * SOLR-5481: SolrCmdDistributor should not let the http client do it's own 
   retries. (Mark Miller)
 
-* SOLR-4709: The core reload after replication if config files have changed
-  can fail due to a race condition. (Mark Miller, Hossman))
-
 * LUCENE-5347: Fixed Solr's Zookeeper Client to copy files to Zookeeper using
   binary transfer. Previously data was read with default encoding and stored
   in zookeeper as UTF-8. This bug was found after upgrading to forbidden-apis
@@ -289,6 +286,9 @@ Bug Fixes
   ZkCmdExecutor#ensureExists to ensure their election paths are properly
   created. (Mark Miller)
 
+* SOLR-4709: The core reload after replication if config files have changed
+  can fail due to a race condition. (Mark Miller, Hossman))
+  
 Optimizations
 ----------------------