aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-03-21 18:16:53 +0100
committerErlang/OTP <[email protected]>2018-03-21 18:16:53 +0100
commit807f58f276402a64041cae0eef612cf78a045bd2 (patch)
tree9a9e12a321f869390c30a5a09764bcb32e1f3b5f
parent5af1c7339be4ad3ec6336e32207cfa70535a5440 (diff)
downloadotp-807f58f276402a64041cae0eef612cf78a045bd2.tar.gz
otp-807f58f276402a64041cae0eef612cf78a045bd2.tar.bz2
otp-807f58f276402a64041cae0eef612cf78a045bd2.zip
Prepare release
-rw-r--r--lib/kernel/doc/src/notes.xml20
-rw-r--r--lib/kernel/vsn.mk2
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index f5a0e68805..c6d7b00e24 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,26 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
+<section><title>Kernel 5.2.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Add <c>os:cmd/2</c> that takes an options map as the
+ second argument.</p>
+ <p>
+ Add <c>max_size</c> as an option to <c>os:cmd/2</c> that
+ control the maximum size of the result that
+ <c>os:cmd/2</c> will return.</p>
+ <p>
+ Own Id: OTP-14823</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 5.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 76b020e8ed..ff8fd8ab63 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 5.2
+KERNEL_VSN = 5.2.0.1