From fb64cba70b4b08442e04c932f88579a35e219fdb Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 7 Dec 2015 11:10:35 +0100
Subject: ssl: Prepare for release

---
 lib/ssl/src/ssl.app.src   |  2 +-
 lib/ssl/src/ssl.appup.src | 14 ++------------
 lib/ssl/vsn.mk            |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index be8ef6f85f..619ab7b610 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -54,6 +54,6 @@
     {env, []},
     {mod, {ssl_app, []}},
     {runtime_dependencies, ["stdlib-2.0","public_key-1.0","kernel-3.0",
-			    "erts-6.0","crypto-3.3", "inets-5.10.7"]}]}.
+			    "erts-7.0","crypto-3.3", "inets-5.10.7"]}]}.
 
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 8d5bd6f8d8..11728128c4 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,14 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {<<"7\\.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
-	       {load_module, ssl_connection, soft_purge, soft_purge, []},
-	       {load_module, tls_connection, soft_purge, soft_purge, []},
-	       {load_module, ssl_session, soft_purge, soft_purge, []},
-	       {load_module, ssl_session_cache, soft_purge, soft_purge, []}
-	      ]},
+  {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
   {<<"5\\..*">>, [{restart_application, ssl}]},
   {<<"4\\..*">>, [{restart_application, ssl}]},
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
  [
-  {<<"7\\.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
-	       {load_module, ssl_connection, soft_purge, soft_purge, []},
-	       {load_module, tls_connection, soft_purge, soft_purge, []},
-	       {load_module, ssl_session, soft_purge, soft_purge, []},
-	       {load_module, ssl_session_cache, soft_purge, soft_purge, []}
-	      ]},
+  {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
   {<<"5\\..*">>, [{restart_application, ssl}]},
   {<<"4\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 4587c448f6..aa1af21990 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 7.1
+SSL_VSN = 7.2
-- 
cgit v1.2.3