diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2020-06-22 16:12:06 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2020-06-22 16:12:06 +0200 |
| commit | 500cdcc35af0e416db19468613401feb85598dc4 (patch) | |
| tree | 214012c59ca4e7f18ca5379d68bf5e8e9e228545 /lib/ftp/doc/src | |
| parent | 592953694e2ee82619c01a79495e2d1f7707de7b (diff) | |
| parent | 5664ccc8f9bbe6d22e4d088e85386cd7ffcee120 (diff) | |
| download | erlang-500cdcc35af0e416db19468613401feb85598dc4.tar.gz | |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/inets/doc/src/notes.xml
# lib/inets/vsn.mk
# lib/ssl/doc/src/notes.xml
# lib/ssl/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'lib/ftp/doc/src')
| -rw-r--r-- | lib/ftp/doc/src/notes.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/ftp/doc/src/notes.xml b/lib/ftp/doc/src/notes.xml index 44348691a2..d80baeeded 100644 --- a/lib/ftp/doc/src/notes.xml +++ b/lib/ftp/doc/src/notes.xml @@ -33,7 +33,23 @@ <file>notes.xml</file> </header> - <section><title>Ftp 1.0.4</title> + <section><title>Ftp 1.0.4.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Avoid timing issue when setting active once on a socket + that is being closed by the peer.</p> + <p> + Own Id: OTP-16734 Aux Id: OTP-16697, ERIERL-496 </p> + </item> + </list> + </section> + +</section> + +<section><title>Ftp 1.0.4</title> <section><title>Fixed Bugs and Malfunctions</title> <list> |