Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 79396 invoked from network); 24 Nov 2009 11:38:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Nov 2009 11:38:11 -0000 Received: (qmail 59268 invoked by uid 500); 24 Nov 2009 11:38:11 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 59203 invoked by uid 500); 24 Nov 2009 11:38:11 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 59194 invoked by uid 99); 24 Nov 2009 11:38:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Nov 2009 11:38:11 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 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, 24 Nov 2009 11:38:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 86EC023888DC; Tue, 24 Nov 2009 11:37:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r883662 - /lucene/java/branches/lucene_3_0/CHANGES.txt Date: Tue, 24 Nov 2009 11:37:47 -0000 To: java-commits@lucene.apache.org From: uschindler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091124113748.86EC023888DC@eris.apache.org> Author: uschindler Date: Tue Nov 24 11:37:44 2009 New Revision: 883662 URL: http://svn.apache.org/viewvc?rev=883662&view=rev Log: merge from trunk Modified: lucene/java/branches/lucene_3_0/CHANGES.txt (contents, props changed) Modified: lucene/java/branches/lucene_3_0/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/CHANGES.txt?rev=883662&r1=883661&r2=883662&view=diff ============================================================================== --- lucene/java/branches/lucene_3_0/CHANGES.txt (original) +++ lucene/java/branches/lucene_3_0/CHANGES.txt Tue Nov 24 11:37:44 2009 @@ -163,6 +163,14 @@ * LUCENE-2088: addAttribute() should only accept interfaces that extend Attribute. (Shai Erera, Uwe Schindler) +* LUCENE-2045: Fix silly FileNotFoundException hit if you enable + infoStream on IndexWriter and then add an empty document and commit + (Shai Erera via Mike McCandless) + +* LUCENE-2046: IndexReader should not see the index as changed, after + IndexWriter.prepareCommit has been called but before + IndexWriter.commit is called. (Peter Keegan via Mike McCandless) + New features * LUCENE-1933: Provide a convenience AttributeFactory that creates a @@ -233,14 +241,6 @@ char (U+FFFD) during indexing, to prevent silent index corruption. (Peter Keegan, Mike McCandless) - * LUCENE-2045: Fix silly FileNotFoundException hit if you enable - infoStream on IndexWriter and then add an empty document and commit - (Shai Erera via Mike McCandless) - - * LUCENE-2046: IndexReader should not see the index as changed, after - IndexWriter.prepareCommit has been called but before - IndexWriter.commit is called. (Peter Keegan via Mike McCandless) - API Changes * Un-deprecate search(Weight weight, Filter filter, int n) from Propchange: lucene/java/branches/lucene_3_0/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 24 11:37:44 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/CHANGES.txt:748824 /lucene/java/branches/lucene_2_9/CHANGES.txt:817269-818600,825998,829134,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/CHANGES.txt:818601-821336 -/lucene/java/trunk/CHANGES.txt:881213,881315,881466,882374,882464,882807,882888,882977,883074-883075 +/lucene/java/trunk/CHANGES.txt:881213,881315,881466,882374,882464,882807,882888,882977,883074-883075,883654,883661