return to release engineering

diff --git a/CHANGES b/CHANGES
index 50eda0e88694f67cd8a847e571fa6e9808e4135a..9b95fd8b7ecea5002e517147bbf328f3355e9600 100644 (file)
--- 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 0666e18a523351a1b32ec2125e80d8221f2c6231..159a3d19e01f923e000221b9b5d97cbd996551fe 100644 (file)
--- 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