diff options
| author | Rickard Green <rickard@erlang.org> | 2020-05-20 12:16:12 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-05-20 12:16:12 +0200 |
| commit | d39b062436b8ea47172846b70c56a3385c2d8092 (patch) | |
| tree | c26feef81750472978fa14afe15f0dcc639dbcf0 /lib | |
| parent | dfeed7ad7f1b8dc644f03bafffdab4ad5804bd81 (diff) | |
| parent | 7367d5d70409cd3696eb84f2e59ebab58ca14be7 (diff) | |
| download | erlang-d39b062436b8ea47172846b70c56a3385c2d8092.tar.gz | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/notes.xml
# erts/vsn.mk
# lib/kernel/doc/src/notes.xml
# lib/kernel/vsn.mk
# lib/megaco/doc/src/notes.xml
# lib/megaco/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/megaco/doc/src/notes.xml | 16 |
2 files changed, 33 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 1e8e52cfb2..478607d0c8 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -414,6 +414,23 @@ </section> +<section><title>Kernel 6.5.2.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix bug in <c>application:loaded_applications/0</c> that + could cause it to fail with <c>badarg</c> if for example + a concurrent upgrade/downgrade is running.</p> + <p> + Own Id: OTP-16627 Aux Id: PR-2601 </p> + </item> + </list> + </section> + +</section> + <section><title>Kernel 6.5.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml index 44a820fc7c..c2f72e8b2f 100644 --- a/lib/megaco/doc/src/notes.xml +++ b/lib/megaco/doc/src/notes.xml @@ -61,6 +61,22 @@ </section> + <section><title>Megaco 3.18.8.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + The mini parser could not properly decode some IPv6 + addresses.</p> + <p> + Own Id: OTP-16631 Aux Id: ERIERL-491 </p> + </item> + </list> + </section> + +</section> + <section><title>Megaco 3.18.8</title> <section><title>Fixed Bugs and Malfunctions</title> |