aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-08-21 12:54:38 +0200
committerErlang/OTP <[email protected]>2013-08-21 12:54:38 +0200
commitb6b47d4c18c88380ea104aab57e13363c7b24a51 (patch)
tree7083aba98b243d6a1cd6aa279da737295f4f22bf /lib/ssl/vsn.mk
parenta21db4078a7b5f23b665dc2d466541b394936cb8 (diff)
parent2ab0f356a00f42060d0f4ca9c4225644e2d9052e (diff)
downloadotp-b6b47d4c18c88380ea104aab57e13363c7b24a51.tar.gz
otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.tar.bz2
otp-b6b47d4c18c88380ea104aab57e13363c7b24a51.zip
Merge branch 'fredrik/inets/ssl/fixup_log_alert_option/OTP-11259' into maint-r15
* fredrik/inets/ssl/fixup_log_alert_option/OTP-11259: [inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel added as option to inets conf file
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 adfb29e639..84728fd311 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.1.2
+SSL_VSN = 5.1.2.1