Import ITS#4040,4046 from HEAD

diff --git a/CHANGES b/CHANGES
index 57289f32f7e64deaeb8edf62dce0429af0408c2d..06c297f2100a214ae55433e4b65f6d44dd8ce88f 100644 (file)
--- 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