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

[ma...@apache.org]

Author: markrmiller
Date: Sat Dec 28 22:37:17 2013
New Revision: 1553951

URL: http://svn.apache.org/r1553951
Log:
SOLR-5532: 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=1553951&r1=1553950&r2=1553951&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Sat Dec 28 22:37:17 2013
@@ -155,10 +155,6 @@ Bug Fixes
 * SOLR-5540: HdfsLockFactory should explicitly create the lock parent directory 
   if necessary. (Mark Miller)
 
-* SOLR-5532: SolrJ Content-Type validation is too strict for some
-  webcontainers / proxies. (Jakob Furrer, hossman, Shawn Heisey, Uwe Schindler,
-  Mark Miller)
-
 * SOLR-5547: Creating a collection alias using SolrJ's CollectionAdminRequest
   sets the alias name and the collections to alias to the same value.
   (Aaron Schram, Mark Miller)
@@ -268,6 +264,10 @@ Bug Fixes
 
 * SOLR-5479: SolrCmdDistributor retry logic stops if a leader for the request 
   cannot be found in 1 second. (Mark Miller)
+
+* SOLR-5532: SolrJ Content-Type validation is too strict for some
+  webcontainers / proxies. (Jakob Furrer, hossman, Shawn Heisey, Uwe Schindler,
+  Mark Miller)
   
 ==================  4.6.0 ==================