From feacdae9c5e2a5d80e0a5dbea5fd9a4c810e2aa3 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Tue, 19 Nov 2013 15:20:51 +0000 Subject: [PATCH] SOLR-5464,SOLR-5465,SOLR-5452: Fix CHANGES entries - move to 4.6 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1543450 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 41fb2b1654c..cc62372d7df 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -114,14 +114,6 @@ Bug Fixes * SOLR-5461: Request proxying should only set con.setDoOutput(true) if the request is a post. (Mark Miller) -* SOLR-5465: SolrCmdDistributor retry logic has a concurrency race bug. - (Mark Miller) - -* SOLR-5464: ConcurrentSolrServer does not stream pure delete by id requests. - (Mark Miller) - -* SOLR-5452: Do not attempt to proxy internal update requests. (Mark Miller) - Optimizations ---------------------- @@ -209,6 +201,9 @@ New Features * SOLR-5084: new field type EnumField. (Elran Dvir via Erick Erickson) +* SOLR-5464: Add option to ConcurrentSolrServer to stream pure delete + requests. (Mark Miller) + Bug Fixes ---------------------- @@ -249,6 +244,11 @@ Bug Fixes * SOLR-5397: Replication can fail silently in some cases. (Mark Miller) +* SOLR-5465: SolrCmdDistributor retry logic has a concurrency race bug. + (Mark Miller) + +* SOLR-5452: Do not attempt to proxy internal update requests. (Mark Miller) + Optimizations ----------------------