diff options
| author | Erlang/OTP <[email protected]> | 2017-10-02 15:55:32 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-10-02 15:55:32 +0200 |
| commit | b584195a6befac314eef75ac3f1ae2ac4f448a61 (patch) | |
| tree | ab9c8e5cf751482cef13ba94c9271b44e9ffe3ca /lib | |
| parent | cdfe0befcbf4fb8efe3dd7476cfff271eff03c37 (diff) | |
| download | otp-b584195a6befac314eef75ac3f1ae2ac4f448a61.tar.gz otp-b584195a6befac314eef75ac3f1ae2ac4f448a61.tar.bz2 otp-b584195a6befac314eef75ac3f1ae2ac4f448a61.zip | |
Prepare release
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compiler/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | lib/compiler/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 28 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
4 files changed, 46 insertions, 2 deletions
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml index 9b32ec54c4..bd095c422a 100644 --- a/lib/compiler/doc/src/notes.xml +++ b/lib/compiler/doc/src/notes.xml @@ -32,6 +32,22 @@ <p>This document describes the changes made to the Compiler application.</p> +<section><title>Compiler 7.1.3</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>The compiler could issue an incorrect internal + consistency failure diagnostic for some complicated bit + syntax maches.</p> + <p> + Own Id: OTP-14640 Aux Id: ERL-490 </p> + </item> + </list> + </section> + +</section> + <section><title>Compiler 7.1.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk index 43fe0c8f6d..435a57aac2 100644 --- a/lib/compiler/vsn.mk +++ b/lib/compiler/vsn.mk @@ -1 +1 @@ -COMPILER_VSN = 7.1.2 +COMPILER_VSN = 7.1.3 diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 4ba75b761f..ef3e94a1e1 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -30,6 +30,34 @@ <file>notes.xml</file> </header> +<section><title>Ssh 4.6.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fixed broken printout</p> + <p> + Own Id: OTP-14645</p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Disable aes_gcm ciphers if peer is OpenSSH 6.2 which is + known to have trouble with them in some cases.</p> + <p> + Own Id: OTP-14638</p> + </item> + </list> + </section> + +</section> + <section><title>Ssh 4.6</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index c201e70d82..5154658e8a 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.6 +SSH_VSN = 4.6.1 APP_VSN = "ssh-$(SSH_VSN)" |