More changes included in last batch

diff --git a/CHANGES b/CHANGES
index 5877eec656e2ab0b11d7a333ab9f8c7ba61779fc..2962f468fe39a708d6ecb8ee3190164f7192dabf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,15 +2,17 @@ OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.15 Engineering
        Fixed back-bdb DB_DEADLOCK memory leak bug (ITS#3213)
+       Fixed back-bdb dbcache locking bug (ITS#3201)
        Fixed slapd oidValidate 0 bug (ITS#3211)
        Fixed slapd uniqueMember/nameUID bugs (ITS#3210)
        Fixed slapd operational attribute log message bug (ITS#3205)
        Fixed slapd invalid cookie in pagedResults control (ITS#3089)
+       Fixed slapi slapi_int_compute_output_ber attrs bug
        Fixed libldap sasl_encode 64-bit bug (ITS#3054,3212)
        Fixed libldap matchedValues parsing bug (ITS#3208)
-       Fixed libldap_r runqueue
-       Fixed slapi slapi_int_compute_output_ber attrs bug
+       Fixed libldap_r runqueue bug
        Build environments
+               Added additional res_query detection for MacOS X
                Added default ldapi:// SSF build setting
 
 OpenLDAP 2.2.14 Release