Preparing for the v2.2-RC2 release

Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 2626cecc530873cc55024dea3a2227ff866feeae..93ef65fd82319ab4f00d5fdc179b264155e81b4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,28 @@
 OpenVPN Change Log
 Copyright (C) 2002-2011 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2011.03.24 -- Version 2.2-RC2
+Alon Bar-Lev (1):
+      Windows cross-compile cleanup
+
+David Sommerseth (2):
+      Open log files as text files on Windows
+      Clarify default value for the --inactive option.
+
+Gert Doering (1):
+      Implement IPv6 in TUN mode for Windows TAP driver.
+
+Samuli Seppänen (6):
+      Added support for prebuilt TAP-drivers. Automated embedding manifests.
+      Fixes to win/openvpn.nsi
+      Replaced config-win32.h with win/config.h.in
+      Updated INSTALL-win32.txt
+      Fixes to Makefile.am
+      Clarified --client-config-dir section on the man-page.
+
+Ville Skyttä (1):
+      Fix line continuation in chkconfig init script description.
+
 2011.02.28 -- Version 2.2-RC
 David Sommerseth (3):
       Make the --x509-username-field feature an opt-in feature

diff --git a/version.m4 b/version.m4
index 2e4664567a3813f8633fc934d730a6d4d2599fb5..a170b4e5487e7abd1a37284f6224abb8e0436b06 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,6 +1,6 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.2-RC])
+define(PRODUCT_VERSION,[2.2-RC2])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])
-define(PRODUCT_TAP_WIN32_MIN_MINOR,[1])
+define(PRODUCT_TAP_WIN32_MIN_MINOR,[8])