summaryrefslogtreecommitdiff
path: root/lib/sasl
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2022-03-09 11:23:39 +0100
committerErlang/OTP <otp@erlang.org>2022-03-09 11:23:39 +0100
commit8f1888b5349c53dbf04211a48d6aa18f9d126cf0 (patch)
tree01bd156d15d6274977c1cf729fb2ecf5b1fbac46 /lib/sasl
parent2125eff04b2b8fe99fc3f01ea8363beffa5b3b74 (diff)
downloaderlang-8f1888b5349c53dbf04211a48d6aa18f9d126cf0.tar.gz
Prepare release
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/doc/src/notes.xml15
-rw-r--r--lib/sasl/src/sasl.appup.src6
-rw-r--r--lib/sasl/vsn.mk2
3 files changed, 20 insertions, 3 deletions
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index a6369b1205..f9162b67e7 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,21 @@
</header>
<p>This document describes the changes made to the SASL application.</p>
+<section><title>SASL 4.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix bug in systools:make_script/1 documentation.</p>
+ <p>
+ Own Id: OTP-17854 Aux Id: PR-5596 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SASL 4.1.1</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 f536696fc2..e2fc3e5b7f 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -37,7 +37,8 @@
{<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.1$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.1\\.1(?:\\.[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]},
@@ -47,4 +48,5 @@
{<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.1$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+ {<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 17e5664e32..c38e64d0a9 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 4.1.1
+SASL_VSN = 4.1.2