From: Bradley Nicholes <bnicholes@apache.org>
Date: Sat, 9 Apr 2005 19:21:48 +0000 (+0000)
Subject: backport
X-Git-Tag: 2.1.5~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc6f77b8ecb205c7e300a896f8d03b9d2ead8974;p=apache

backport

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

diff --git a/CHANGES b/CHANGES
index 77c5b75dd0..cc9d523582 100644
--- a/CHANGES
+++ b/CHANGES
@@ -113,10 +113,6 @@ Changes with Apache 2.1.3
   *) mod_cache: Add CacheStorePrivate and CacheStoreNoStore directive.
      [Justin Erenkrantz]
 
-  *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
-     the ldap socket connection timeout value.  
-     [Brad Nicholes]
-
   *) Add --enable-pie flag to configure, to build httpd as a Position
      Independent Executable where supported (GCC/binutils).
      [Joe Orton]
@@ -649,6 +645,10 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.54
 
+  *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
+     the ldap socket connection timeout value.  
+     [Brad Nicholes]
+
   *) worker MPM: Fix a problem which could cause httpd processes to
      remain active after shutdown.  [Jeff Trawick]