diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-12-02 12:21:42 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-12-02 12:21:42 +0100 |
| commit | b3f18a3df707c53c8ba430a15a18f83cee55d5c0 (patch) | |
| tree | 925addc0367e1a2787f3f88ad5cdad518a1a8473 | |
| parent | 0099374ccc47f6c02298ee6fc6a1bba27bdec28b (diff) | |
| parent | a78880847efe3370ce101fc3888e25a33c459e55 (diff) | |
| download | otp-b3f18a3df707c53c8ba430a15a18f83cee55d5c0.tar.gz otp-b3f18a3df707c53c8ba430a15a18f83cee55d5c0.tar.bz2 otp-b3f18a3df707c53c8ba430a15a18f83cee55d5c0.zip | |
Merge branch 'ia/ssl/app-upp/ssl-4.1.1' into dev
* ia/ssl/app-upp/ssl-4.1.1:
Prepare for release
| -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 f4e6b59b6d..51c5289bd2 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,9 +1,11 @@ %% -*- erlang -*- {"%VSN%", [ + {"4.1", [{restart_application, ssl}]}, {"4.0.1", [{restart_application, ssl}]} ], [ + {"4.1", [{restart_application, ssl}]}, {"4.0.1", [{restart_application, ssl}]} ]}. diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 30a0a3b3f7..ee692adb3b 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1,2 +1,2 @@ -SSL_VSN = 4.1 +SSL_VSN = 4.1.1 |