aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-12-06 14:49:31 +0100
committerErlang/OTP <[email protected]>2012-12-06 14:49:31 +0100
commit2067c7c77d74b715c77648b37517a06e163c4b6b (patch)
treea92a91598fb11846fe422aed017ee53753ae8db3 /lib/ssl/vsn.mk
parentd5de2e1ffd6403f5d7ec62e6ce8da508e1cb1239 (diff)
parent51e291fe0ae69412ee3d2cbde768c92e3f239a2f (diff)
downloadotp-2067c7c77d74b715c77648b37517a06e163c4b6b.tar.gz
otp-2067c7c77d74b715c77648b37517a06e163c4b6b.tar.bz2
otp-2067c7c77d74b715c77648b37517a06e163c4b6b.zip
Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15
* egil/ia/ssl/accept-timeout/OTP-10600: ssl: Prepare for release ssl: Export sslsocket() dialyzer type ssl: Cancel non expired timers ssl: Fix recv after timeout expired ssl: Timeout handling changed so that the fsm-process will terminate if the ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires.
Diffstat (limited to 'lib/ssl/vsn.mk')
-rw-r--r--lib/ssl/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index bc8b8fd039..adfb29e639 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.1.1
+SSL_VSN = 5.1.2