From: Howard Chu <hyc@openldap.org>
Date: Sun, 2 Sep 2007 13:54:09 +0000 (+0000)
Subject: ITS#4848, #5082 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_39~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1db30f23e3df6a708b3fed85a82001f50999bef;p=thirdparty%2Fopenldap.git

ITS#4848, #5082 from HEAD
---

diff --git a/CHANGES b/CHANGES
index e9bc8990c8..07a7a170e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,10 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.39 Engineering
+	Fixed slapd database/overlay config conflict (ITS#4848)
+	Fixed slapd password_hash config order (ITS#5082)
 	Fixed slapd-sql concurrency issue (ITS#5095)
-        Fixed slapo-pcache and -rwm interaction fix (ITS#4991) 
+	Fixed slapo-pcache and -rwm interaction fix (ITS#4991) 
 	Fixed liblber Windows x64 portability (ITS#5105)
 	Fixed libldap ppolicy control creation (ITS#5103)
 	Documentation