aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-09-21 10:55:16 +0200
committerBjörn Gustavsson <[email protected]>2015-09-21 10:55:16 +0200
commit7721a7c919df3bfac6f8ced7471d3e5dfcf41bd4 (patch)
tree3179794ac8fa8dff7d71453a4ba2832bf09bb4cb /lib
parent576b2e9cbb4dab925b3943d2b82b43a3b4d79487 (diff)
parentc2fd9dc8a249a4cb093e9133fd3a3cf0d6711ff5 (diff)
downloadotp-7721a7c919df3bfac6f8ced7471d3e5dfcf41bd4.tar.gz
otp-7721a7c919df3bfac6f8ced7471d3e5dfcf41bd4.tar.bz2
otp-7721a7c919df3bfac6f8ced7471d3e5dfcf41bd4.zip
Merge branch 'maint'
* maint: Update sasl vsn to 2.6
Diffstat (limited to 'lib')
-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