Reflect last merge - now ready for release

diff --git a/CHANGES b/CHANGES
index c908386efe5f2d7e13e0566948e02a42b71515c3..0339a7d375a54c4e3cc7eeaf742bcbe0f76e238a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,17 +15,20 @@ OpenLDAP 2.3.12 Release
        Fixed slapd cn=config init issue (ITS#4128)
        Fixed slapd non-reentrant libwrap issue (ITS#4099)
        Fixed slapd AIX IFMT issue (ITS#4123)
+       Fixed slapd thread v. tools_threads settings
        Fixed ldapmodrdn empty line handling (ITS#4101)
        Fixed slapd-bdb uninitialized condition in tool mode (ITS#4143)
        Fixed slapd-bdb empty suffix and syncprov issue (ITS#4171)
        Fixed slapd-hdb syncrepl deadlock issue (ITS#4088)
        Added slapd-ldap write op timeout support (ITS#4157)
+       Fixed slapd-ldap/slapo-chain matched dn handling (ITS#4176)
        Fixed slapd-meta invalid DN attrs normalize/pretty issue (ITS#4107)
        Fixed slapd-meta rootdn erroneous success issue (ITS#4122)
        Fixed slapd-meta proxying bind result issue (ITS#4129)
        Fixed slapd-meta/slapo-rwm rwm-mapping issue (ITS#4086)
        Fixed slapd-meta per-target retry (ITS#4150)
        Fixed slapd-meta size/time limit handling (ITS#4145)
+       Fixed slapd-sql size limit count (ITS#4181)
        Fixed slapo-ppolicy pwdFailureTIme after bind success issue (ITS#4134)
        Fixed slapo-ppolicy add passord_hash quality config dependency
        Fixed slapo-syncprov LDAP response types (ITS#4183)