summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2019-01-25 13:21:49 +0100
committerLukas Larsson <lukas@erlang.org>2019-01-25 13:21:49 +0100
commitecbfc52f06a71ed553a5986c6a13bc893586615b (patch)
tree17b5d55a6f1c940608f64628888651394e3791e7 /lib
parent839b3dfc6295a9bbfb42a9af8820c9e580beaea2 (diff)
parent35f51c7f057943c25ccb7997526c9d47aed0cd0b (diff)
downloaderlang-ecbfc52f06a71ed553a5986c6a13bc893586615b.tar.gz
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/doc/src/notes.xml20
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 20 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 12f5acb2e9..cf39ab4796 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,25 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 7.0.3</title>
+ <section><title>Inets 7.0.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Make sure ipv6 addresses with brackets in URIs are
+ converted correctly before passing to lower level
+ functions like gen_tcp and ssl functions. Could cause
+ connection to fail.</p>
+ <p>
+ Own Id: OTP-15544 Aux Id: ERIERL-289 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 7.0.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 52c05a7974..1d1560213e 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 7.0.3
+INETS_VSN = 7.0.4
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"