aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-05-10 17:05:49 +0200
committerRickard Green <[email protected]>2017-05-10 17:05:49 +0200
commit2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df (patch)
tree0c9d9a5b20e54da38902527064e1622720b43553 /lib
parent6b278ecbc1384f338b6ac8accec37fc72bf538f2 (diff)
parent0066f7e19efc89214724a20b3a1f3b181518fd9b (diff)
downloadotp-2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df.tar.gz
otp-2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df.tar.bz2
otp-2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes inets: Prepare for release inets: Mend ipv6_host_with_brackets option
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/doc/src/notes.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index e23e8d0415..8e314a000f 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -383,6 +383,21 @@
</section>
+ <section><title>Inets 6.1.1.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Mend ipv6_host_with_brackets option in httpc</p>
+ <p>
+ Own Id: OTP-13417</p>
+ </item>
+ </list>
+ </section>
+
+ </section>
+
<section><title>Inets 6.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>