From 3a8f2995caffacddabb3363453c6a7dbc33d6329 Mon Sep 17 00:00:00 2001
From: Erlang/OTP
Date: Thu, 10 Mar 2016 13:10:51 +0100
Subject: Prepare release
---
erts/doc/src/notes.xml | 19 +++++++++++++++++++
erts/vsn.mk | 2 +-
lib/diameter/doc/src/notes.xml | 32 ++++++++++++++++++++++++++++++++
lib/ssl/doc/src/notes.xml | 18 +++++++++++++++++-
lib/ssl/vsn.mk | 2 +-
5 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 9ff2e5de08..24bcc76e4b 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,25 @@
This document describes the changes made to the ERTS application.
+Erts 6.4.1.6
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ When calling garbage_collect/[1,2] or
+ check_process_code/[2,3] from a process with a
+ higher priority than the priority of the process operated
+ on, the run queues could end up in an inconsistent state.
+ This bug has now been fixed.
+
+ Own Id: OTP-13298 Aux Id: OTP-11388
+
+
+
+
+
+
Erts 6.4.1.5
Fixed Bugs and Malfunctions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 98946f4797..2aad279414 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
# %CopyrightEnd%
#
-VSN = 6.4.1.5
+VSN = 6.4.1.6
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 2fc30db324..638b6e24b6 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -42,6 +42,38 @@ first.
+diameter 1.9.2.4
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Fix handling of shared peer connections in watchdog state
+ SUSPECT.
+
+ A peer connection shared from a remote node was regarded
+ as being up for the lifetime of the connection, ignoring
+ watchdog transitions into state SUSPECT.
+
+ Own Id: OTP-13342
+
+
+
+
+
+ Improvements and New Features
+
+ -
+
+ no
+
+ Own Id: OTP-13385
+
+
+
+
+
+
diameter 1.9.2.3
Fixed Bugs and Malfunctions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 14df10b571..759a3b3fce 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -25,7 +25,23 @@
notes.xml
This document describes the changes made to the SSL application.
- SSL 6.0.1.1
+ SSL 6.0.1.2
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Hibernation with small or a zero timeout will now work as
+ expected
+
+ Own Id: OTP-13189
+
+
+
+
+
+
+SSL 6.0.1.1
Fixed Bugs and Malfunctions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index eedf8cf705..29f51032e1 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 6.0.1.1
+SSL_VSN = 6.0.1.2
--
cgit v1.2.3