Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D0E7F101EB for ; Tue, 25 Mar 2014 01:04:13 +0000 (UTC) Received: (qmail 3565 invoked by uid 500); 25 Mar 2014 01:04:12 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 3489 invoked by uid 99); 25 Mar 2014 01:04:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2014 01:04:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2014 01:04:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B400E23888E4; Tue, 25 Mar 2014 01:03:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1581173 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt Date: Tue, 25 Mar 2014 01:03:50 -0000 To: commits@lucene.apache.org From: sarowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140325010350.B400E23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sarowe Date: Tue Mar 25 01:03:50 2014 New Revision: 1581173 URL: http://svn.apache.org/r1581173 Log: SOLR-5761: move CHANGES.txt entry to 4.7.1 section (merged trunk r1581172) 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=1581173&r1=1581172&r2=1581173&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original) +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Mar 25 01:03:50 2014 @@ -109,9 +109,6 @@ New Features Bug Fixes ---------------------- -* SOLR-5761: HttpSolrServer has a few fields that can be set via setters but - are not volatile. (Mark Miller, Gregory Chanan) - * SOLR-5811: The Overseer will retry work items until success, which is a serious problem if you hit a bad work item. (Mark Miller) @@ -276,6 +273,9 @@ Bug Fixes streamDeletes is true that should be tucked into the if statement below it. (Mark Miller, Gregory Chanan) +* SOLR-5761: HttpSolrServer has a few fields that can be set via setters but + are not volatile. (Mark Miller, Gregory Chanan) + ================== 4.7.0 ================== Versions of Major Components