summaryrefslogtreecommitdiff
path: root/erts
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2021-05-20 16:05:51 +0200
committerErlang/OTP <otp@erlang.org>2021-05-20 16:05:51 +0200
commite6f7121456b61309015eff3a1bf9f6ef442c6ac3 (patch)
treec78a5a85189b7622aa3c089355da70e623ce6d10 /erts
parent400c8f74503205fb893152c69d49a0facdd5fc46 (diff)
downloaderlang-e6f7121456b61309015eff3a1bf9f6ef442c6ac3.tar.gz
Prepare release
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml15
-rw-r--r--erts/vsn.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 4ec66b4dc5..cd10f45726 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,21 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 12.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 12.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 5aed65cbb9..78fb2c8cf6 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 12.0
+VSN = 12.0.1
# Port number 4365 in 4.2
# Port number 4366 in 4.3