diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2021-07-22 09:29:17 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2021-07-22 09:29:17 +0200 |
| commit | 55957a8856f907c09f0130cd9fbb8b088683e336 (patch) | |
| tree | fbb71915d90d8de0f482dff0a69dd0cdf66055f5 /lib/stdlib | |
| parent | 13f57e4c2caa0288c213ad6d1da55c539b6f1148 (diff) | |
| parent | c07336b844645f80430505194c01ffd59672804f (diff) | |
| download | erlang-55957a8856f907c09f0130cd9fbb8b088683e336.tar.gz | |
Merge branch 'maint-24' into maint
* maint-24:
Updated OTP version
Prepare release
# Conflicts:
# lib/ssl/src/ssl.app.src
# make/otp_version_tickets
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 2 | ||||
| -rw-r--r-- | lib/stdlib/vsn.mk | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 5af91394e3..53aba962aa 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,23 @@ </header> <p>This document describes the changes made to the STDLIB application.</p> +<section><title>STDLIB 3.15.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix a bug that could cause a crash when formatting tuples + using the control sequences <c>p</c> or <c>P</c> and + limiting the output with the option <c>chars_limit</c>.</p> + <p> + Own Id: OTP-17525 Aux Id: GH-5053 </p> + </item> + </list> + </section> + +</section> + <section><title>STDLIB 3.15.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 7ef667ca67..a3b702b873 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -47,6 +47,7 @@ {<<"^3\\.14\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^3\\.15$">>,[restart_new_emulator]}, {<<"^3\\.15\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^3\\.15\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^3\\.9$">>,[restart_new_emulator]}, {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -70,6 +71,7 @@ {<<"^3\\.14\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^3\\.15$">>,[restart_new_emulator]}, {<<"^3\\.15\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^3\\.15\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^3\\.9$">>,[restart_new_emulator]}, {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk index d2ddd6aed5..1205439b2e 100644 --- a/lib/stdlib/vsn.mk +++ b/lib/stdlib/vsn.mk @@ -1 +1 @@ -STDLIB_VSN = 3.15.1 +STDLIB_VSN = 3.15.2 |