diff options
| author | Henrik Nord <henrik@erlang.org> | 2020-04-22 09:27:45 +0200 |
|---|---|---|
| committer | Henrik Nord <henrik@erlang.org> | 2020-04-22 09:27:45 +0200 |
| commit | 9a6e292336cb36561f9a993f86ddee363f1d0850 (patch) | |
| tree | 1892d776510cb103e9f66b7af07b9d5f8056c155 /lib/sasl | |
| parent | da82f4d35e481727a78d7a4e86b5c85553780304 (diff) | |
| download | erlang-9a6e292336cb36561f9a993f86ddee363f1d0850.tar.gz | |
Revert "Prepare release"
This reverts commit eee1f3aba92b5a741eabfa1cb6eca0632562777a.
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/doc/src/notes.xml | 28 | ||||
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 7 | ||||
| -rw-r--r-- | lib/sasl/vsn.mk | 2 |
3 files changed, 3 insertions, 34 deletions
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml index 86957877ac..5982ce005d 100644 --- a/lib/sasl/doc/src/notes.xml +++ b/lib/sasl/doc/src/notes.xml @@ -31,34 +31,6 @@ </header> <p>This document describes the changes made to the SASL application.</p> -<section><title>SASL 3.5</title> - - <section><title>Improvements and New Features</title> - <list> - <item> - <p> - Remove usage and documentation of old requests of the - I/O-protocol.</p> - <p> - Own Id: OTP-15695</p> - </item> - <item> - <p> - <c>systools:make_script/2</c> now accepts the name of the - boot file to create, it is not restricted to only - <c>RelName.boot</c> or <c>start.boot</c>.</p> - <p> - <c>systools:make_tar/2</c> now accepts the option - <c>extra_files</c> to add any extra non release related - files to the tar file.</p> - <p> - Own Id: OTP-16561 Aux Id: PR-2420 </p> - </item> - </list> - </section> - -</section> - <section><title>SASL 3.4.2</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 621454d6a4..b795123645 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -21,7 +21,6 @@ %% versions from the following OTP releases: %% - OTP 21 %% - OTP 22 -%% - OTP 23 %% %% We also allow upgrade from, and downgrade to all %% versions that have branched off from the above @@ -35,8 +34,7 @@ {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.4$">>,[restart_new_emulator]}, {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], + {<<"^3\\.4\\.1(?:\\.[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]}, @@ -44,5 +42,4 @@ {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.4$">>,[restart_new_emulator]}, {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. + {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk index b5c28cd83b..fd045e49d5 100644 --- a/lib/sasl/vsn.mk +++ b/lib/sasl/vsn.mk @@ -1 +1 @@ -SASL_VSN = 3.5 +SASL_VSN = 3.4.2 |