aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-01-21 10:16:28 +0100
committerIngela Anderton Andin <[email protected]>2016-01-21 10:43:48 +0100
commita25e3e814febd5459e77435cb972f5baa5eebbf5 (patch)
treeabf834dc1425a9592f95b5234bf194679daf03a2
parent5ae72e324513fe1b724b7eaa3a707302338646c7 (diff)
downloadotp-a25e3e814febd5459e77435cb972f5baa5eebbf5.tar.gz
otp-a25e3e814febd5459e77435cb972f5baa5eebbf5.tar.bz2
otp-a25e3e814febd5459e77435cb972f5baa5eebbf5.zip
ssl: Prepare for release
-rw-r--r--lib/ssl/src/ssl.appup.src6
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 11728128c4..057906bcb3 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,9 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []},
+ {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []}
+ ]},
{<<"7\\..*">>, [{restart_application, ssl}]},
{<<"6\\..*">>, [{restart_application, ssl}]},
{<<"5\\..*">>, [{restart_application, ssl}]},
@@ -8,6 +11,9 @@
{<<"3\\..*">>, [{restart_application, ssl}]}
],
[
+ {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []},
+ {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []}
+ ]},
{<<"7\\..*">>, [{restart_application, ssl}]},
{<<"6\\..*">>, [{restart_application, ssl}]},
{<<"5\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index aa1af21990..9f79a7fb34 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 7.2
+SSL_VSN = 7.2.1