From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 22 Apr 2005 23:43:53 +0000 (+0000)
Subject: return to release engineering
X-Git-Tag: OPENLDAP_REL_ENG_2_2_26~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2e1fc52d965e6263382b54be0df799dfe15c86;p=thirdparty%2Fopenldap.git

return to release engineering
---

diff --git a/CHANGES b/CHANGES
index 50eda0e886..9b95fd8b7e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 OpenLDAP 2.2 Change Log
 
+OpenLDAP 2.2.26 Engineering
+
 OpenLDAP 2.2.25 Release
 	Fixed back-hdb out-of-order slapadd (ITS#3267)
 	Fixed back-bdb/hdb search crashes (ITS#3638, 3647)
@@ -9,7 +11,7 @@ OpenLDAP 2.2.25 Release
 	Fixed back-ldbm shutdown hang (ITS#3648)
 	Fixed back-meta memory leak (ITS#3669)
 	Fixed back-monitor attribute normalization bug (ITS#3659)
-	Removed broken libldap fast synchronous search result processing
+	Removed broken libldap fast synchronous search result processing (ITS#3612)
 	Build Environment
 		Added improved configure logging
 
diff --git a/build/version.var b/build/version.var
index 0666e18a52..159a3d19e0 100644
--- a/build/version.var
+++ b/build/version.var
@@ -15,7 +15,7 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=2
-ol_patch=25
+ol_patch=X
 ol_api_inc=20225
 ol_api_current=7
 ol_api_revision=18