From f008bba60547abedd3ea92f7863e9ade865ee42a Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Fri, 29 Jun 2012 01:48:24 +0000
Subject: [PATCH] fixup changes entries that didnt make the alpha

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1355204 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt |  8 +++++---
 solr/CHANGES.txt   | 33 +++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 0fb1edcb783..66082532d37 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -22,6 +22,11 @@ Bug Fixes
   so that it works correctly with Analyzers that produce binary non-UTF-8 terms
   such as CollationAnalyzer. (Nattapong Sirilappanich via Robert Muir) 
 
+Build
+
+* LUCENE-4115: JAR resolution/ cleanup should be done automatically for ant 
+  clean/ eclipse/ resolve (Dawid Weiss)
+
 ======================= Lucene 4.0.0-ALPHA =======================
 
 More information about this release, including any errata related to the 
@@ -1097,9 +1102,6 @@ Documentation
 
 Build
 
-* LUCENE-4115: JAR resolution/ cleanup should be done automatically for ant 
-  clean/ eclipse/ resolve (Dawid Weiss)
-
 * LUCENE-4047: Cleanup of LuceneTestCase: moved blocks of initialization/ cleanup
   code into JUnit instance and class rules. (Dawid Weiss)
 
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 59366c5817d..e56490cfb59 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -24,6 +24,27 @@ $Id$
 
 (No changes)
 
+==================  4.0.0-BETA ===================
+
+New Features
+
+* SOLR-1856: In Solr Cell, literals should override Tika-parsed values.
+  Patch adds a param "literalsOverride" which defaults to true, but can be set 
+  to "false" to let Tika-parsed values be appended to literal values (Chris Harris, janhoy)
+
+Bug Fixes
+
+* SOLR-3582: Our ZooKeeper watchers respond to session events as if they are change events, 
+  creating undesirable side effects. (Trym R. Møller, Mark Miller)
+
+* SOLR-3467: ExtendedDismax escaping is missing several reserved characters
+  (Michael Dodsworth via janhoy)
+
+Other Changes
+
+* SOLR-1770: Move the default core instance directory into a collection1 folder.
+  (Mark Miller)
+
 ==================  4.0.0-ALPHA ==================
 More information about this release, including any errata related to the 
 release notes, upgrade instructions, or other changes may be found online at:
@@ -141,8 +162,6 @@ New Features
   (yonik, Mark Miller, siren)
   SOLR-3437: Recovery issues a spurious commit to the cluster. (Trym R. Møller via Mark Miller)
   SOLR-2822: Skip update processors already run on other nodes (hossman)
-  SOLR-3582: Our ZooKeeper watchers respond to session events as if they are change events, 
-  creating undesirable side effects. (Trym R. Møller, Mark Miller)
 
 * SOLR-1566: Transforming documents in the ResponseWriters.  This will allow
   for more complex results in responses and open the door for function queries
@@ -378,10 +397,6 @@ New Features
 * SOLR-3542: Add WeightedFragListBuilder for FVH and set it to default fragListBuilder
   in example solrconfig.xml. (Sebastian Lutze, koji)
 
-* SOLR-1856: In Solr Cell, literals should override Tika-parsed values.
-  Patch adds a param "literalsOverride" which defaults to true, but can be set 
-  to "false" to let Tika-parsed values be appended to literal values (Chris Harris, janhoy)
-
 Optimizations
 ----------------------
 
@@ -524,9 +539,6 @@ Bug Fixes
 
 * SOLR-3522: fixed parsing of the 'literal()' function (hossman)
 
-* SOLR-3467: ExtendedDismax escaping is missing several reserved characters
-  (Michael Dodsworth via janhoy)
-
 * SOLR-3548: Fixed a bug in the cachability of queries using the {!join} 
   parser or the strdist() function, as well as some minor improvements to 
   the hashCode implementation of {!bbox} and {!geofilt} queries.
@@ -685,9 +697,6 @@ Other Changes
   when 'qf' is absent.  And if neither is present nor the schema default search field
   then an exception will be thrown now. (dsmiley)
   
-* SOLR-1770: Move the default core instance directory into a collection1 folder.
-  (Mark Miller)
-
 Documentation
 ----------------------