Ready for release

diff --git a/CHANGES b/CHANGES
index 25038e434d65b4f1b3faf09f037c12fcb53768c9..4a3a0dca213bd249ade6b9625c456ecaf23e64c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
 OpenLDAP 2.0 Change Log
 
-OpenLDAP 2.0.18 Engineering
+OpenLDAP 2.0.18 Release
        Fixed -llber ber_bvecadd bug (ITS#1398)
+       Fixed slap tools replica config bug (ITS#1385)
        Build environment
                Updated req_query detection
 

diff --git a/build/top.mk b/build/top.mk
index 185a90d2b7e2bcbc8f38c0087e0e14a65c6d4d3c..29a3ece97696f8dc979fa656a1de6ff991068c95 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -56,7 +56,7 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
 MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
 LIBTOOL = @LIBTOOL@
-LIBVERSION = 2:11:0
+LIBVERSION = 2:12:0
 LTVERSION = -version-info $(LIBVERSION)
 #We don't use our own shared libraries (yet)
 #LTLINK  = $(LIBTOOL) --mode=link $(CC) -rpath $(libdir) \

diff --git a/build/version b/build/version
index e301407e6c8ecfef109668721baea333e436d963..79e77c8514353fe75d280d767591e2f4ce026b49 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.18-Engineering
+2.0.18-Release

diff --git a/include/ldap.h b/include/ldap.h
index df1462c55f229dbe46a1a96eea12a97226f3977c..10ee75f1aa64dfb2b7a65a3ee482813116ea96dc 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -50,7 +50,7 @@ LDAP_BEGIN_DECL
  *     2.0.0  -> 20000
  *     2.3.16 -> 20316
  */
-#define LDAP_VENDOR_VERSION    20017
+#define LDAP_VENDOR_VERSION    20018
 
 /* OpenLDAP API Features */
 #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION