From: Paul J. Reder <rederpj@apache.org>
Date: Thu, 5 Feb 2004 19:09:31 +0000 (+0000)
Subject: Re-synch with 2.0 stable branch after backport.
X-Git-Tag: pre_ajp_proxy~729
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894f7a9f470ec4c284897296cc791ead4e3d7862;p=thirdparty%2Fapache%2Fhttpd.git

Re-synch with 2.0 stable branch after backport.


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

diff --git a/CHANGES b/CHANGES
index 4ab7d913446..a58adc9d33b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -79,9 +79,6 @@ Changes with Apache 2.1.0-dev
      directory, display the MPM name and some MPM properties.
      [Geoffrey Young <geoff apache.org>]
 
-  *) Fixed cache-removal order in mod_mem_cache.
-     [Jean-Jacques Clar, Cliff Woolley]
-
   *) Add fatal exception hook for use by debug modules.  The hook is only
      available if the --enable-exception-hook configure parm is used.
      [Jeff Trawick]
@@ -264,6 +261,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Fixed cache-removal order in mod_mem_cache.
+     [Jean-Jacques Clar, Cliff Woolley]
+
   *) mod_setenvif: Fix the regex optimizer, which under circumstances
      treated the supplied regex as literal string. PR 24219.
      [André Malo]