diff options
| author | Hans Nilsson <hans@erlang.org> | 2019-11-19 09:44:28 +0100 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2019-11-19 09:44:28 +0100 |
| commit | ac306d485c4a317859d5e082ded578b9c72c2f4c (patch) | |
| tree | bfd8eb0d5b82e832924dc22c73067a1589eb2cd6 /lib/ftp | |
| parent | 465d5f939d2a98d22fb1a6c29b3b1eacb51a46a0 (diff) | |
| parent | 2896f4f12a9d9c3adeea41537348ded1a0f7ed32 (diff) | |
| download | erlang-ac306d485c4a317859d5e082ded578b9c72c2f4c.tar.gz | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/notes.xml
# erts/vsn.mk
# lib/ftp/doc/src/notes.xml
# lib/ftp/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'lib/ftp')
| -rw-r--r-- | lib/ftp/doc/src/notes.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/ftp/doc/src/notes.xml b/lib/ftp/doc/src/notes.xml index 19cb663a9f..8c1b73e87d 100644 --- a/lib/ftp/doc/src/notes.xml +++ b/lib/ftp/doc/src/notes.xml @@ -49,6 +49,21 @@ </section> + <section><title>Ftp 1.0.2.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + A possibly infinite loop is removed.</p> + <p> + Own Id: OTP-16243 Aux Id: PR-2436, OTP-16056 </p> + </item> + </list> + </section> + +</section> + <section><title>Ftp 1.0.2.1</title> <section><title>Fixed Bugs and Malfunctions</title> |