From: Howard Chu <hyc@openldap.org>
Date: Wed, 28 Sep 2005 15:14:09 +0000 (+0000)
Subject: Import ITS#4040,4046 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_29~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f1ec0815b8ab71b03df7fc3c44c4732fd0d7c8;p=thirdparty%2Fopenldap.git

Import ITS#4040,4046 from HEAD
---

diff --git a/CHANGES b/CHANGES
index 57289f32f7..06c297f210 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
 OpenLDAP 2.2 Change Log
 
-OpenLDAP 2.2.28 Engineering
+OpenLDAP 2.2.29 Engineering
+	Fixed slapd uniqueMemberMatch (ITS#4040)
 	Fixed back-hdb slapcat EntryInfo cache growth (ITS#4010)
+	Fixed liblber sb_dgram_read length (ITS#4046)
 
 OpenLDAP 2.2.28 Release
 	Fixed slapd ACL logging