aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-04-24 14:29:10 +0200
committerRickard Green <[email protected]>2019-04-24 14:29:10 +0200
commit0f2ddb633ffe97a92584edfbaf95d2dce3961cc8 (patch)
treeb760449c28fa4e4325f553b6f075d2c4599c3f22 /lib/sasl
parent5b56ecbe12493a1ff6a0e975a65cefd09005cecd (diff)
downloadotp-0f2ddb633ffe97a92584edfbaf95d2dce3961cc8.tar.gz
otp-0f2ddb633ffe97a92584edfbaf95d2dce3961cc8.tar.bz2
otp-0f2ddb633ffe97a92584edfbaf95d2dce3961cc8.zip
Revert "Prepare release"
This reverts commit 425889ba69b69a9b6fb14bfbef121d51b78e853a.
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, 16 insertions, 27 deletions
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 13546a6a62..982c874117 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,23 +31,6 @@
</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 22a9027b7c..26127eae84 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,21 +19,27 @@
%%
%% 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\\.2$">>,[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\\.0(?:\\.[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]}],
- [{<<"^3\\.2$">>,[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\\.0(?:\\.[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]}]}.
+ {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 8838b514da..c1f80752a7 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.4
+SASL_VSN = 3.3