aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-03 10:14:39 +0200
committerHans Nilsson <[email protected]>2017-10-03 10:14:39 +0200
commit38d25c94cee65f69b8b44cc24a351fa887a981b2 (patch)
tree00373bff271ec115c1af78195fcf38b5a2a012bc /lib/compiler
parent4d2a2f5f327aa6804c37ef7fe0c41c2f58555239 (diff)
parent8fb29181bca26c221ca0a3364f71f79d3d3a4db4 (diff)
downloadotp-38d25c94cee65f69b8b44cc24a351fa887a981b2.tar.gz
otp-38d25c94cee65f69b8b44cc24a351fa887a981b2.tar.bz2
otp-38d25c94cee65f69b8b44cc24a351fa887a981b2.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug) Conflicts: OTP_VERSION
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/doc/src/notes.xml16
-rw-r--r--lib/compiler/vsn.mk2
2 files changed, 17 insertions, 1 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