From 6f9e35dae8e327aff2d7c0f80332bb770759142b Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 22 Jan 1999 22:29:15 +0000
Subject: [PATCH] Update changes with recent imports from 1.2.

---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 18ccf30c63..6d5034fbab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 OpenLDAP Change Log
 
+Changes included in OpenLDAP 1.1.4
+	CVS Tag: OPENLDAP_REL_ENG_1_1
+	Fixed slapd/add entry rwlock race fix.
+	Fixed slapd/nextid race fix.
+
 Changes included in OpenLDAP 1.1.3
 	CVS Tag: OPENLDAP_REL_ENG_1_1_3
 	Updated LICENSE to allow open use of linked software
-- 
2.47.2