From db23db43c173ea2cbd4acf135698a9c098203f42 Mon Sep 17 00:00:00 2001
From: Michael McCandless <mikemccand@apache.org>
Date: Wed, 29 Jan 2014 16:23:22 +0000
Subject: [PATCH] LUCENE-3069: move CHANGES entries under 4.7

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1562498 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 2bd348f1549..a74d85cdd32 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -19,12 +19,6 @@ New Features
   responsible for iterating through all fields, terms, documents and
   positions.  (Robert Muir, Mike McCandless)
 
-* LUCENE-3069: Add two memory resident dictionaries (FST terms dictionary and 
-  FSTOrd terms dictionary) to improve primary key lookups. The PostingsBaseFormat 
-  API is also changed so that term dictionaries get the ability to block 
-  encode term metadata, and all dictionary implementations can now plug in any 
-  PostingsBaseFormat. (Han Jiang, Mike McCandless)
-
 * LUCENE-5268: Full cutover of all postings formats to the "pull"
   FieldsConsumer API, removing PushFieldsConsumer.  Added new
   PushPostingsWriterBase for single-pass push of docs/positions to the
@@ -119,6 +113,12 @@ New Features
 * LUCENE-5415: Add multitermquery (wildcards,prefix,etc) to PostingsHighlighter.
   (Mike McCandless, Robert Muir)
 
+* LUCENE-3069: Add two memory resident dictionaries (FST terms dictionary and 
+  FSTOrd terms dictionary) to improve primary key lookups. The PostingsBaseFormat 
+  API is also changed so that term dictionaries get the ability to block 
+  encode term metadata, and all dictionary implementations can now plug in any 
+  PostingsBaseFormat. (Han Jiang, Mike McCandless)
+
 Build
 
 * LUCENE-5217: Maven config: get dependencies from Ant+Ivy config; disable
@@ -229,6 +229,11 @@ API Changes
   only accepts a ValueSource instead of a convenience ctor for an expression
   string. (Simon Willnauer)
 
+* LUCENE-3069: PostingsWriterBase and PostingsReaderBase are no longer
+  responsible for encoding/decoding a block of terms.  Instead, they
+  should encode/decode each term to/from a long[] and byte[].  (Han
+  Jiang, Mike McCandless)
+
 Optimizations
 
 * LUCENE-5372: Replace StringBuffer by StringBuilder, where possible.