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

[el...@apache.org]

Author: elyograg
Date: Thu Jan  9 22:18:53 2014
New Revision: 1556969

URL: http://svn.apache.org/r1556969
Log:
SOLR-5543: Move changes entry from 4.7.0 to 4.6.1 (merge trunk r1556968)

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=1556969&r1=1556968&r2=1556969&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Jan  9 22:18:53 2014
@@ -152,9 +152,6 @@ Bug Fixes
 * SOLR-5540: HdfsLockFactory should explicitly create the lock parent directory 
   if necessary. (Mark Miller)
 
-* SOLR-5543: Core swaps resulted in duplicate core entries in solr.xml when 
-  using solr.xml persistence. (Bill Bell, Alan Woodward)
-
 * SOLR-5562: ConcurrentUpdateSolrServer constructor ignores supplied httpclient.
   (Kyle Halliday via Mark Miller)
 
@@ -314,6 +311,8 @@ Bug Fixes
 * SOLR-5615: Deadlock while trying to recover after a ZK session expiration.
   (Ramkumar Aiyengar, Mark Miller)
   
+* SOLR-5543: Core swaps resulted in duplicate core entries in solr.xml when 
+  using solr.xml persistence. (Bill Bell, Alan Woodward)
 
 Optimizations
 ----------------------