From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 26 Nov 2002 20:27:54 +0000 (+0000)
Subject: reflect latest merge from head
X-Git-Tag: OPENLDAP_REL_ENG_2_1_9~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8dfde61518d8a48233dc91d58ecf021aca361a4f;p=openldap

reflect latest merge from head
---

diff --git a/CHANGES b/CHANGES
index d5a1f95044..2344fec1f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,10 +7,12 @@ OpenLDAP 2.1.9 Engineering
 	Fixed slapd unix socket unlink bug (ITS#2157)
 	Fixed slapd empty SASL cred bug
 	Fixed slapd referral/alias normalization bug
-	Fixed slapd logging bugs (ITS#2170)
-	Fixed slapd rootdse entry_free bug (ITS#2172)
 	Added slapd allow update_anon feature (ITS#2155)
 	Added slapd authz stats logging feature (ITS#2165)
+	Fixed slapd logging bugs (ITS#2170)
+	Fixed slapd rootdse entry_free bug (ITS#2172)
+	Fixed slapd multimaster passwd bug (ITS#2176)
+	Fixed slapd bad acl DN bug (ITS#2196)
 	Removed lint
 	Build Environment
 		Add subordinate referral test