ITS#4848, #5082 from HEAD

diff --git a/CHANGES b/CHANGES
index e9bc8990c85ddeb9aa75f72610adab53402f0d18..07a7a170e6065fdc9e3e46fee0d02df61a690efd 100644 (file)
--- 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