diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-15 10:49:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-15 10:49:40 +0100 |
| commit | 45305535f3348d8ea9a637b2236fd079e147971c (patch) | |
| tree | 5c7f7cd7ff7703ca200d43b7a94d50d7d970ab86 /lib/ssl | |
| parent | 96890a04beaa831ac10a2c30e595acbaf0823dc4 (diff) | |
| parent | c8c5ea1f4bd44bf265e4687a5c730abf57683d9a (diff) | |
| download | otp-45305535f3348d8ea9a637b2236fd079e147971c.tar.gz otp-45305535f3348d8ea9a637b2236fd079e147971c.tar.bz2 otp-45305535f3348d8ea9a637b2236fd079e147971c.zip | |
Merge branch 'ia/ssl/prepare-for-relese'
* ia/ssl/prepare-for-relese:
Prepare version and appup for release
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 29674f30da..1b07e76d6a 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,6 +1,7 @@ %% -*- erlang -*- {"%VSN%", [ + {"4.1.6", [{restart_application, ssl}]}, {"4.1.5", [{restart_application, ssl}]}, {"4.1.4", [{restart_application, ssl}]}, {"4.1.3", [{restart_application, ssl}]}, @@ -10,6 +11,7 @@ {"4.0.1", [{restart_application, ssl}]} ], [ + {"4.1.6", [{restart_application, ssl}]}, {"4.1.5", [{restart_application, ssl}]}, {"4.1.4", [{restart_application, ssl}]}, {"4.1.3", [{restart_application, ssl}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 8286201df4..2255798f1d 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 4.1.6 +SSL_VSN = 5.0 |