diff options
| author | Hans Nilsson <[email protected]> | 2018-04-20 11:53:39 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-20 11:53:39 +0200 |
| commit | 38be1e447d1a64aa528ecae2d5e957d21e069019 (patch) | |
| tree | 8e57a39c8773cfe7e3c13bf14bac09241b879656 /lib/inets | |
| parent | 21754c8d402855af5081dad0aff465a8f0f7eda7 (diff) | |
| parent | 0343b68b053ee97b2ef70ea07b9aa87e8842c591 (diff) | |
| download | otp-38be1e447d1a64aa528ecae2d5e957d21e069019.tar.gz otp-38be1e447d1a64aa528ecae2d5e957d21e069019.tar.bz2 otp-38be1e447d1a64aa528ecae2d5e957d21e069019.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
inets: Fix broken httpc options handling
ssh: Fix server crashes for exit-normal signals
ssh: Fix ssh_sftpd:handle_op not returning State
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index ca37a54691..10dd26322c 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,22 @@ <file>notes.xml</file> </header> - <section><title>Inets 6.5</title> + <section><title>Inets 6.5.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix broken options handling in httpc (ERL-441).</p> + <p> + Own Id: OTP-15007</p> + </item> + </list> + </section> + +</section> + +<section><title>Inets 6.5</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 1fad9afe33..3a489357ff 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 6.5 +INETS_VSN = 6.5.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |