aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-09-26 12:33:40 +0200
committerHenrik Nord <[email protected]>2017-09-26 12:33:40 +0200
commit25587f05f5d80f9cfa25df953b3ce7f53c70d31a (patch)
treedfe3cb303402f0ebf8107ff77a764ab9286f67d9 /lib/inets
parent3c23f2c6335d8586aca1efb9da6d20f00a8840fd (diff)
parent02fd746c40e829adbe77cc526c7df904698e2534 (diff)
downloadotp-25587f05f5d80f9cfa25df953b3ce7f53c70d31a.tar.gz
otp-25587f05f5d80f9cfa25df953b3ce7f53c70d31a.tar.bz2
otp-25587f05f5d80f9cfa25df953b3ce7f53c70d31a.zip
Merge branch 'maint'
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/notes.xml24
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 24 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index c85600d0be..10ef84d7cf 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,29 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 6.4.1</title>
+ <section><title>Inets 6.4.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Make sure mod_log uses the correct status code</p>
+ <p>
+ Own Id: OTP-14510</p>
+ </item>
+ <item>
+ <p>
+ Correct behaviour of mod_disk_log to proparly handle
+ repair options</p>
+ <p>
+ Own Id: OTP-14530</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 6.4.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index c4314f1ab5..34b6902747 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.4.1
+INETS_VSN = 6.4.2
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"