Update changes in preparation of release.

diff --git a/CHANGES b/CHANGES
index e1df1e47e13dd7215bdedc50750394cdae55ba08..bbd46649b9200778b06ad82b895b01ef7b1a4e70 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,20 +10,24 @@ Changes included in OpenLDAP 1.2
        Added slapd nextid chunking
        Added LDBM DB2 debugging support
        Fixed client SIGPIPE handling
-       Fixed configure wait3 handling
        Fixed lber leaking ber_scanf
-       Fixed slapd/add entry rwlock race fix.
-       Fixed slapd/nextid race fix.
        Updated client -d(ebug) handling
        Updated slapd alias deref functionality to be optional
-       Updated slapd DN handling
        Updated client/tools Kerberos option handling
+
+Changes included in OpenLDAP 1.1.4
+       CVS Tag: OPENLDAP_REL_ENG_1_1_4
+       Updated docs
+       Fixed slapd/back-ldbm/add entry rwlock race bug
+       Fixed slapd/back-ldbm/nextid race bug
+       Fixed slapd/back-ldbm -DSLAPD_ALIAS_DEREF bug
+       Fixed slapd/dn_parent unnormalized bug
+       Fixed slapd/tcpd statslog bug
        Build environment
-               Added -kthread detection for FreeBSD kernel threads.
-               Added libtool support for FreeBSD 4.x
-               Removed wait3 test.
+               Removed wait3 test
+               Added FreeBSD 4 support
 
-Changes included in OpenLDAP 1.1.3
+Changes included in OpenLDAP 1.1.3 (BRANCH POINT)
        CVS Tag: OPENLDAP_REL_ENG_1_1_3
        Updated LICENSE to allow open use of linked software
        Updated docs