diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-15 14:21:45 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-15 14:21:45 +0100 |
| commit | 9b7d4359fd771fc3e7589dc91e091c7c35a65807 (patch) | |
| tree | c19609e2786154b70ff455c53f4c676db8a6bc09 | |
| parent | a7af6cae44d1837d0c6cb35b99feff1260659102 (diff) | |
| parent | bdc34f0f247628bc285143f250192e4c6016c812 (diff) | |
| download | otp-9b7d4359fd771fc3e7589dc91e091c7c35a65807.tar.gz otp-9b7d4359fd771fc3e7589dc91e091c7c35a65807.tar.bz2 otp-9b7d4359fd771fc3e7589dc91e091c7c35a65807.zip | |
Merge remote branch 'upstream/maint'
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 15 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 76550fa04b..c118c129e8 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,14 +1,21 @@ %% -*- erlang -*- {"%VSN%", [ - {"5.0.1", [{restart_application, ssl}]}, - {"5.0", [{restart_application, ssl}]}, + {"5.1", [ + {load_module, ssl_connection, soft_purge, soft_purge, []} + ] + }, + {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} ], [ - {"5.0.1", [{restart_application, ssl}]}, - {"5.0", [{restart_application, ssl}]}, + {"5.1", [ + {load_module, ssl_connection, soft_purge, soft_purge, []} + ] + }, + {"5.1", [{restart_application, ssl}]}, + {<<"5.0\\*">>, [{restart_application, ssl}]}, {<<"4\\.*">>, [{restart_application, ssl}]}, {<<"3\\.*">>, [{restart_application, ssl}]} ]}. diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index e381b73c27..bc8b8fd039 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 5.1 +SSL_VSN = 5.1.1 |