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

[ma...@apache.org]

Author: markrmiller
Date: Sun Jan 19 21:02:25 2014
New Revision: 1559584

URL: http://svn.apache.org/r1559584
Log:
SOLR-5636: Move CHANGES entry to 4.6 branch

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=1559584&r1=1559583&r2=1559584&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sun Jan 19 21:02:25 2014
@@ -175,9 +175,6 @@ Bug Fixes
 * SOLR-4992: Solr eats OutOfMemoryError exceptions in many cases.
   (Mark Miller, Daniel Collins)  
 
-* SOLR-5636: SolrRequestParsers does some xpath lookups on every request, which
-  can cause concurrency issues. (Mark Miller)
-
 * LUCENE-5399, SOLR-5354 sort wouldn't work correctly with
   distributed searching for some field types such as legacy numeric
   types (Rob Muir, Mike McCandless)
@@ -358,6 +355,9 @@ Bug Fixes
 * SOLR-5645: A SolrCore reload via the CoreContainer will try and register in
   zk again with the new SolrCore. (Mark Miller)
 
+* SOLR-5636: SolrRequestParsers does some xpath lookups on every request, which
+  can cause concurrency issues. (Mark Miller)
+
 Optimizations
 ----------------------