Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / CHANGES

diff --git a/CHANGES b/CHANGES
index d207d2049838befe9475dbec02b67906500b5ae8..11e4eed1496352c78d1bb0c84070460378c08017 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
 OpenLDAP 2.4 Change Log
 
-OpenLDAP 2.4.36 Engineering
+OpenLDAP 2.4.37 Engineering
+
+OpenLDAP 2.4.36 Release (2013/08/17)
        Added back-meta target filter patterns (ITS#7609)
+       Added liblmdb mdb_txn_env to API (ITS#7660)
        Fixed libldap CLDAP with uninit'd memory (ITS#7582)
        Fixed libldap with UDP (ITS#7583)
        Fixed libldap OpenSSL TLS versions (ITS#7645)
@@ -11,10 +14,13 @@ OpenLDAP 2.4.36 Engineering
        Fixed liblmdb nested split (ITS#7592)
        Fixed liblmdb overflow page behavior (ITS#7620)
        Fixed liblmdb race condition with read and write txns (ITS#7635)
+       Fixed liblmdb mdb_del behavior with MDB_DUPSORT and mdb_del (ITS#7658)
        Fixed slapd cn=config with unknown schema elements (ITS#7608)
        Fixed slapd cn=config with loglevel 0 (ITS#7611)
        Fixed slapd slapi filterlist free behavior (ITS#7636)
        Fixed slapd slapi control free behavior (ITS#7641)
+       Fixed slapd schema countryString as directoryString (ITS#7659)
+       Fixed slapd schema telephoneNumber as directoryString (ITS#7659)
        Fixed slapd-bdb/hdb to wait for read locks in tool mode (ITS#6365)
        Fixed slapd-mdb behavior with alias dereferencing (ITS#7577)
        Fixed slapd-mdb modrdn and base-scoped searches (ITS#7604)