diff options
| author | Erlang/OTP <otp@erlang.org> | 2023-03-21 13:23:19 +0100 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2023-03-21 13:23:19 +0100 |
| commit | 1cf126f91eb533783409da95b117207d8c13d9aa (patch) | |
| tree | efb80e7e4849aedd6f96f56b742735d0900a86fa /lib/sasl | |
| parent | 65e4ce9fc89943cb47292084e650c957a6904a8d (diff) | |
| download | erlang-1cf126f91eb533783409da95b117207d8c13d9aa.tar.gz | |
Prepare release
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 22 | ||||
| -rw-r--r-- | lib/sasl/vsn.mk | 2 |
3 files changed, 27 insertions, 14 deletions
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml index 78de4f2f39..179f8df9dc 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 4.2.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Improve error message from systools:make_script, when + .app parameters contain duplicates. The parameters that + will be checked are modules, applications and registered.</p> + <p> + Own Id: OTP-18300 Aux Id: PR-6389 </p> + </item> + </list> + </section> + +</section> + <section><title>SASL 4.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index 3752c085e2..644de80438 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -19,28 +19,24 @@ %% %% We allow upgrade from, and downgrade to all previous %% versions from the following OTP releases: -%% - OTP 23 %% - OTP 24 %% - OTP 25 +%% - OTP 26 %% %% We also allow upgrade from, and downgrade to all %% versions that have branched off from the above %% stated previous versions. %% {"%VSN%", - [{<<"^4\\.0$">>,[restart_new_emulator]}, - {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^4\\.1$">>,[restart_new_emulator]}, + [{<<"^4\\.1$">>,[restart_new_emulator]}, {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], - [{<<"^4\\.0$">>,[restart_new_emulator]}, - {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^4\\.1$">>,[restart_new_emulator]}, + {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^4\\.2$">>,[restart_new_emulator]}, + {<<"^4\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}], + [{<<"^4\\.1$">>,[restart_new_emulator]}, {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. + {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^4\\.2$">>,[restart_new_emulator]}, + {<<"^4\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}. diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk index 0fbf91bf53..569f493b68 100644 --- a/lib/sasl/vsn.mk +++ b/lib/sasl/vsn.mk @@ -1 +1 @@ -SASL_VSN = 4.2 +SASL_VSN = 4.2.1 |