Preparing for release v2.4_alpha2 (ChangeLog, version.m4)

Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/ChangeLog b/ChangeLog
index 23ee03f6bec10409eeb72d000a0c2ff6821342b3..cf76d7d677ceaaa627d87ff424eefd6178df2ad9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 OpenVPN Change Log
 Copyright (C) 2002-2016 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2016.10.19 -- Version 2.4_alpha2
+
+David Sommerseth (1):
+      Update .mailmap to unify and clean up odd names and e-mail addresses
+
+Steffan Karger (1):
+      Fix use-after-free bug in prepare_push_reply()
+
+
 2016.10.17 -- Version 2.4_alpha1
 
 Adriaan de Jong (2):

diff --git a/version.m4 b/version.m4
index 6124cbfb4eeb4e89d94499b3851b4516c65d3c9b..dccd58f4446095eb0b52cb0700538fcb9934ad1a 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -3,7 +3,7 @@ define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
 define([PRODUCT_VERSION_MAJOR], [2])
 define([PRODUCT_VERSION_MINOR], [4])
-define([PRODUCT_VERSION_PATCH], [_alpha1])
+define([PRODUCT_VERSION_PATCH], [_alpha2])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MAJOR])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MINOR], [[.]])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_PATCH], [[]])