You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by us...@apache.org on 2009/11/24 12:37:47 UTC

svn commit: r883662 - /lucene/java/branches/lucene_3_0/CHANGES.txt

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