aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-12-28 12:11:18 +0100
committerErlang/OTP <[email protected]>2018-12-28 12:11:18 +0100
commit5e53cfd7555f68e3c2c408e84c8007efcd4bd552 (patch)
tree9e49632723c9605cb8a396fbd5f96125c7b12e7b
parent08df5db981fe8ca7065d5204821e9c0d18b5533d (diff)
downloadotp-5e53cfd7555f68e3c2c408e84c8007efcd4bd552.tar.gz
otp-5e53cfd7555f68e3c2c408e84c8007efcd4bd552.tar.bz2
otp-5e53cfd7555f68e3c2c408e84c8007efcd4bd552.zip
Prepare release
-rw-r--r--erts/doc/src/notes.xml20
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/ssh/doc/src/notes.xml15
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--make/otp_version_tickets3
5 files changed, 39 insertions, 3 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index b909e18dc6..65dce336c2 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 9.3.3.7</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed bug in operator <c>band</c> of two negative
+ operands causing erroneous result if the absolute value
+ of one of the operands have the lowest <c>N*W</c> bits as
+ zero and the other absolute value is not larger than
+ <c>N*W</c> bits. <c>N</c> is an integer of 1 or larger
+ and <c>W</c> is 32 or 64 depending on word size.</p>
+ <p>
+ Own Id: OTP-15487 Aux Id: ERL-804 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 9.3.3.6</title>
<section><title>Improvements and New Features</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 71f4d0bec9..f85f3d629c 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 9.3.3.6
+VSN = 9.3.3.7
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 1f01ce5e6c..7d47674d39 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,21 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.6.9.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed port leakage if a ssh:daemon call failed.</p>
+ <p>
+ Own Id: OTP-15397 Aux Id: ERL-801 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.6.9.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 9644330eff..2674126672 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.6.9.2
+SSH_VSN = 4.6.9.3
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 9460a888a0..5148d2743f 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1 +1,2 @@
-OTP-15470
+OTP-15397
+OTP-15487