Sync Solr changes in trunk

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1626396 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -29,6 +29,31 @@ Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
 
+Upgrading from Solr 5.x
+----------------------
+
+* N/A
+
+Detailed Change List
+----------------------
+
+Other Changes
+----------------------
+
+* SOLR-4792: Stop shipping a .war. (Robert Muir)
+
+==================  5.0.0 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
+
+Versions of Major Components
+---------------------
+Apache Tika 1.6
+Carrot2 3.9.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+
 Upgrading from Solr 4.x
 ----------------------
 
@@ -57,9 +82,13 @@ Upgrading from Solr 4.x
 
 * The CollectionsAPI SolrJ calls createCollection(), reloadCollection(),
   deleteCollection(), requestStatus(), createShard(), splitShard(), deleteShard(),
-  createAlias() and deleteAlias() which were deprecated in 5.0 have been removed.
+  createAlias() and deleteAlias() which were deprecated in 4.11 have been removed.
   The new usage involves a builder style construction of the call.
 
+* The OVERSEERSTATUS API returns new key names for operations such as "create"
+  for "createcollection", "delete" for "removecollection" and "deleteshard" for
+  "removeshard".
+
 Detailed Change List
 ----------------------
 
@@ -79,65 +108,6 @@ New Features
 * SOLR-6103: Added DateRangeField for indexing date ranges, especially
   multi-valued ones. Based on LUCENE-5648. (David Smiley)
 
-Other Changes
-----------------------
-
-* SOLR-4622: Hardcoded SolrCloud defaults for hostContext and hostPort that
-  were deprecated in 4.3 have been removed completely. (hossman)
-
-* SOLR-4792: Stop shipping a .war. (Robert Muir)
-
-* SOLR-5936: Removed deprecated non-Trie-based numeric & date field types.
-  (Steve Rowe)
-
-* SOLR-6169: Finish removal of CoreAdminHandler handleAlias action begun in 4.9 
-  (Alan Woodward)
-
-* SOLR-6215: TrieDateField should directly extend TrieField instead of
-  forwarding to a wrapped TrieField. (Steve Rowe)
-  
-* SOLR-3029: Changes to spellcheck response format (Nalini Kartha via James Dyer)
-
-* SOLR-3957: Removed RequestHandlerUtils#addExperimentalFormatWarning(), which
-  removes "experimental" warning from two places: replication handler details
-  command and DataImportHandler responses. (ehatcher)
-
-* SOLR-6073: Remove helper methods from CollectionsRequest (SolrJ) for CollectionsAPI
-  calls and move to a builder design for the same. (Varun Thacker, Anshum Gupta)
-
-* SOLR-6519: Make DirectoryFactory#create() take LockFactory.
-  (Uwe Schindler)
-
-==================  5.0.0 =================
-
-Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
-
-Versions of Major Components
----------------------
-Apache Tika 1.6
-Carrot2 3.9.0
-Velocity 1.7 and Velocity Tools 2.0
-Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.6
-Noggit 0.6
-
-Upgrading from Solr 4.10
-----------------------
-* The CollectionsAPI SolrJ calls createCollection(), reloadCollection(),
-  deleteCollection(), requestStatus(), createShard(), splitShard(), deleteShard(),
-  createAlias() and deleteAlias() have been deprecated. The new usage involves a
-  builder style construction of the call.
-
-* The OVERSEERSTATUS API returns new key names for operations such as "create"
-  for "createcollection", "delete" for "removecollection" and "deleteshard" for
-  "removeshard".
-
-Detailed Change List
-----------------------
-
-New Features
-----------------------
-
 * SOLR-6403: TransactionLog replay status logging. (Mark Miller)
 
 * SOLR-4580: Support for protecting content in ZooKeeper. (Per Steffensen, Mark Miller)
@@ -216,8 +186,33 @@ Bug Fixes
 
 * SOLR-6507: Fixed several bugs involving stats.field used with local params (hossman)
 
+
 Other Changes
----------------------
+----------------------
+
+* SOLR-4622: Hardcoded SolrCloud defaults for hostContext and hostPort that
+  were deprecated in 4.3 have been removed completely. (hossman)
+
+* SOLR-5936: Removed deprecated non-Trie-based numeric & date field types.
+  (Steve Rowe)
+
+* SOLR-6169: Finish removal of CoreAdminHandler handleAlias action begun in 4.9 
+  (Alan Woodward)
+
+* SOLR-6215: TrieDateField should directly extend TrieField instead of
+  forwarding to a wrapped TrieField. (Steve Rowe)
+  
+* SOLR-3029: Changes to spellcheck response format (Nalini Kartha via James Dyer)
+
+* SOLR-3957: Removed RequestHandlerUtils#addExperimentalFormatWarning(), which
+  removes "experimental" warning from two places: replication handler details
+  command and DataImportHandler responses. (ehatcher)
+
+* SOLR-6073: Remove helper methods from CollectionsRequest (SolrJ) for CollectionsAPI
+  calls and move to a builder design for the same. (Varun Thacker, Anshum Gupta)
+
+* SOLR-6519: Make DirectoryFactory#create() take LockFactory.
+  (Uwe Schindler)
 
 * SOLR-6400: SolrCloud tests are not properly testing session expiration. (Mark Miller)
 
@@ -248,7 +243,6 @@ Other Changes
 * SOLR-6115: Cleanup enum/string action types in Overseer, OverseerCollectionProcessor and
   CollectionHandler. (Erick Erickson, shalin)
 
-
 ==================  4.10.0 =================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release