Ready for release

diff --git a/CHANGES b/CHANGES
index a9effb8dd471d01a60c6159fe7044493118041f3..8889938c4e91eaf7a77f20f93c71fdd9ad8dd1bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 OpenLDAP 2.1 Change Log
 
-OpenLDAP 2.1.6 Engineering
+OpenLDAP 2.1.6 Release
        Fixed slapd unsupported non-critical control handling
        Fixed slapd value_find() uninitialized variable bug (ITS#2097)
        Fixed back-dnssrv default referral handling (ITS#2116)
@@ -10,13 +10,14 @@ OpenLDAP 2.1.6 Engineering
        Updated slapd adlist support
        Updated slapd disallow bind_simple_unprotected
        Updated back-bdb/ldbm add/delete/rename ACLs
+       Updated back-shell surrogate parent code
        Updated libldap_r Pth support (ITS#724) (ITS#1033)
        Added libldap get referral option (ITS#2121)
        Added libldap DIT content rule routines
        Added back-shell "entry" ACLs
-       Added slapd obsolete checks
+       Added slapd obsolete schema checks
        Disable suffixAlias feature (ITS#2117)
-       Removed lint
+       Misc minor fixes and cleanup
        Build Environment
                Fixed back-bdb module linking problem
                Fixed misc. portability bugs
@@ -25,7 +26,7 @@ OpenLDAP 2.1.6 Engineering
                Updated shtool
                Updated test suite
        Documentation
-               Misc. updates
+               Misc. updates (ITS#2093) (ITS#2105) (ITS#2106)
 
 OpenLDAP 2.1.5 Release
        Fixed back-ldbm indirect IDL bug (ITS#2039)

diff --git a/build/version.sh b/build/version.sh
index d66f61895fab0d4135050619427dda2bc5cee546..9b82ca0688f24e4d6432a4053e50439b47a86067 100755 (executable)
--- a/build/version.sh
+++ b/build/version.sh
@@ -7,9 +7,9 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=1
-ol_patch=X
-ol_api_inc=20105
-ol_api_lib=2:105:0
+ol_patch=6
+ol_api_inc=20106
+ol_api_lib=2:106:0
 
 if test $ol_patch != X ; then
        ol_version=${ol_major}.${ol_minor}.${ol_patch}