aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-04-23 17:38:37 +0200
committerErlang/OTP <[email protected]>2019-04-23 17:38:37 +0200
commit425889ba69b69a9b6fb14bfbef121d51b78e853a (patch)
treeb6f7544d61dbec9097384639bd43990f7e1baa7e /lib/sasl
parent93ec8bb2dbba9456395a54551fe9f1e0f86184b1 (diff)
downloadotp-425889ba69b69a9b6fb14bfbef121d51b78e853a.tar.gz
otp-425889ba69b69a9b6fb14bfbef121d51b78e853a.tar.bz2
otp-425889ba69b69a9b6fb14bfbef121d51b78e853a.zip
Prepare release
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/doc/src/notes.xml17
-rw-r--r--lib/sasl/src/sasl.appup.src24
-rw-r--r--lib/sasl/vsn.mk2
3 files changed, 27 insertions, 16 deletions
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 982c874117..13546a6a62 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,23 @@
</header>
<p>This document describes the changes made to the SASL application.</p>
+<section><title>SASL 3.4</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Change the first module called by erts to be names
+ erl_init instead of otp_ring0. systools in sasl have been
+ updated to reflect this change.</p>
+ <p>
+ Own Id: OTP-15336 Aux Id: PR-1825 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SASL 3.3</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 26127eae84..22a9027b7c 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,27 +19,21 @@
%%
%% We allow upgrade from, and downgrade to all previous
%% versions from the following OTP releases:
-%% - OTP 20
%% - OTP 21
+%% - OTP 22
%%
%% We also allow upgrade from, and downgrade to all
%% versions that have branched off from the above
%% stated previous versions.
%%
{"%VSN%",
- [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.1$">>,[restart_new_emulator]},
- {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.2$">>,[restart_new_emulator]},
+ [{<<"^3\\.2$">>,[restart_new_emulator]},
{<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.1$">>,[restart_new_emulator]},
- {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.2$">>,[restart_new_emulator]},
+ {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.3$">>,[restart_new_emulator]},
+ {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^3\\.2$">>,[restart_new_emulator]},
{<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+ {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.3$">>,[restart_new_emulator]},
+ {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index c1f80752a7..8838b514da 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.3
+SASL_VSN = 3.4