From: Rainer Jung <rjung@apache.org>
Date: Tue, 31 Jan 2012 20:54:22 +0000 (+0000)
Subject: Remove changes from trunk CHANGES that have already
X-Git-Tag: 2.5.0-alpha~7526
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b4e6be04d07ac6b84cdec71687c5301f9207e7b;p=thirdparty%2Fapache%2Fhttpd.git

Remove changes from trunk CHANGES that have already
been backported to 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238810 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index b5eb1a2745c..35108a3e931 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,13 +13,6 @@ Changes with Apache 2.5.0
      passing through the server in such a way that connections and/or
      requests be reconstructed and replayed. [Graham Leggett]
 
-  *) ap_pass_brigade_fchk() added. [Jim Jagielski]
-
-  *) error log hook: Pass ap_errorlog_info struct.  [Stefan Fritsch]
-
-  *) Core configuration: add AllowOverride option to treat syntax
-     errors in .htaccess as non-fatal.  PR 52439 [Nick Kew]
-
   [Apache 2.5.0-dev includes those bug fixes and changes with the
    Apache 2.4.xx tree as documented below, except as noted.]