From 41d99b0fd412c9a7ea5a080274fac98a84ec283b Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 23 Nov 2018 09:44:32 +0100
Subject: Prepare release

---
 erts/doc/src/notes.xml   | 20 ++++++++++++++++++++
 erts/vsn.mk              |  2 +-
 make/otp_version_tickets |  4 +---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 5dabb2adf9..b9f5ef70bf 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,26 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.1.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Added an optional <c>./configure</c> flag to compile
+	    the emulator with spectre mitigation:
+	    <c>--with-spectre-mitigation</c></p>
+	    <p>Note that this requires a recent version of GCC with
+	    support for spectre mitigation and the
+	    <c>--mindirect-branch=thunk</c> flag, such as
+	    <c>8.1</c>.</p>
+          <p>
+	    Own Id: OTP-15430 Aux Id: ERIERL-237 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 241d5a3b85..643a8a2e76 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.1.2
+VSN = 10.1.3
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 84ff07a3e0..9e8ac34fde 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,3 +1 @@
-OTP-15353
-OTP-15367
-OTP-15421
+OTP-15430
-- 
cgit v1.2.3