aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2015-09-17 12:36:51 +0200
committerSiri Hansen <[email protected]>2015-09-17 12:36:51 +0200
commit3524231c8142165f4c468de2b76b3cb5a5139c2c (patch)
tree8e2f92d810fc2392003ea6b1d011724dbc38223d
parente81be158ef17428532c76bcf7d4c69284163be1e (diff)
downloadotp-3524231c8142165f4c468de2b76b3cb5a5139c2c.tar.gz
otp-3524231c8142165f4c468de2b76b3cb5a5139c2c.tar.bz2
otp-3524231c8142165f4c468de2b76b3cb5a5139c2c.zip
Update sasl vsn to 2.6
-rw-r--r--lib/sasl/src/sasl.appup.src6
-rw-r--r--lib/sasl/vsn.mk2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index eddb5a3fd0..2c8812f566 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -18,7 +18,9 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
+ [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.*
+ {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
%% Down to - max one major revision back
- [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
+ [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.*
+ {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 9e69ddab65..959d9c88d5 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 2.5.1
+SASL_VSN = 2.6