From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 25 Apr 2013 00:05:51 +0000 (-0700)
Subject: ITS#7513
X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~70
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=88c23803ec614cee5b0ca67e95f46a8cd84c64cd;p=openldap

ITS#7513
---

diff --git a/CHANGES b/CHANGES
index b2e4e227ac..4e290486e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,9 @@ OpenLDAP 2.4.36 Engineering
 	Fixed liblmdb MDB_PREV behavior (ITS#7556)
 	Fixed liblmdb transaction issues (ITS#7515)
 	Fixed liblmdb mdb_drop overflow page return (ITS#7561)
-	Fixed back-bdb/hdb to wait for read locks in tool mode (ITS#6365)
-	Fixed back-meta binding flag is set (ITS#7524)
+	Fixed slapd-bdb/hdb to wait for read locks in tool mode (ITS#6365)
+	Fixed slapd-meta binding flag is set (ITS#7524)
+	Added slapd-meta TCP keepalive support (ITS#7513)
 	Fixed slaptest to list -Q option (ITS#7568)
 	Documentation
 		ldap.conf(5) fixed typos (ITS#7568)