aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2010-09-01 17:20:36 +0200
committerErlang/OTP <otp@erlang.org>2010-09-01 17:20:36 +0200
commitf673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08 (patch)
tree8756f4ef4a1e9b0e3eb0439bc0423a7904520bae
parentc9e24bdf95c7d0d1e2f0ecce24a1ffc1102b0ec2 (diff)
downloadotp-f673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08.tar.gz
otp-f673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08.tar.bz2
otp-f673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08.zip
Prepare release
-rw-r--r--lib/kernel/doc/src/notes.xml17
-rw-r--r--lib/kernel/vsn.mk2
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index aa652020d9..5467cd8cde 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,23 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
+<section><title>Kernel 2.13.5.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>A bug introduced in kernel-2.13.5.3 has been fixed. If
+ running <c>net_kernel:set_net_ticktime/1</c> twice within
+ the <c>TransitionPerod</c> the second call caused the
+ net_kernel process to crash with a <c>badmatch</c>.</p>
+ <p>
+ Own Id: OTP-8787 Aux Id: seq11657, OTP-8643 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 2.13.5.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index ff195f6334..933600b501 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.13.5.3
+KERNEL_VSN = 2.13.5.4