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

[ma...@apache.org]

Author: markrmiller
Date: Wed Mar 19 17:42:55 2014
New Revision: 1579311

URL: http://svn.apache.org/r1579311
Log:
SOLR-5782: Move CHANGES entry to 4.7.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=1579311&r1=1579310&r2=1579311&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Mar 19 17:42:55 2014
@@ -93,9 +93,6 @@ Bug Fixes
 * SOLR-5777: Fix ordering of field values in JSON updates where
   field name key is repeated (hossman)
 
-* SOLR-5782: The full MapReduceIndexer help text does not display when using
-  --help.  (Mark Miller, Wolfgang Hoschek)
-
 * SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis
   when calculating elapsed time. (Mark Miller, Ramkumar Aiyengar)
 
@@ -226,6 +223,9 @@ Bug Fixes
 * SOLR-5866: UpdateShardHandler needs to use the system default scheme registry to
   properly handle https via javax.net.ssl.* properties. (Steve Davids via shalin)
 
+* SOLR-5782: The full MapReduceIndexer help text does not display when using
+  --help.  (Mark Miller, Wolfgang Hoschek)
+
 ==================  4.7.0 ==================
 
 Versions of Major Components