aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-08-15 11:11:12 +0200
committerIngela Anderton Andin <[email protected]>2018-08-15 11:11:12 +0200
commitb20087d24c30331ceb314650a4128c6345e11f61 (patch)
treefb10aef76e2bbc8758cf53227198526931e0229f /lib/inets/doc/src
parent621cf67c97c89e18399ec6a21dde2c6275493b5e (diff)
parent70aceaec7a985c27787f37ce07e4b072ec52ed61 (diff)
downloadotp-b20087d24c30331ceb314650a4128c6345e11f61.tar.gz
otp-b20087d24c30331ceb314650a4128c6345e11f61.tar.bz2
otp-b20087d24c30331ceb314650a4128c6345e11f61.zip
Merge branch 'maint-20' into maint
* maint-20: inets: Remove 21 test case Updated OTP version Update release notes Conflicts: OTP_VERSION lib/inets/doc/src/notes.xml lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk otp_versions.table
Diffstat (limited to 'lib/inets/doc/src')
-rw-r--r--lib/inets/doc/src/notes.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index fadfdd500f..d1fbbfc2b5 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,7 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 7.0</title>
+ <section><title>Inets 7.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
@@ -92,6 +92,22 @@
</section>
+ <section><title>Inets 6.5.2.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Change status code for no mod found to handle request to
+ 501</p>
+ <p>
+ Own Id: OTP-15215</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Inets 6.5.2.2</title>
<section><title>Fixed Bugs and Malfunctions</title>