diff options
| author | Rickard Green <[email protected]> | 2017-10-11 15:16:02 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-11 15:16:02 +0200 |
| commit | 9cccec48c38544df1d00230aeb340b37890ab8c8 (patch) | |
| tree | ac04a6dbca68d4f93f6addc416579baaefa220b2 /erts | |
| parent | b42792cb96262b1c10baf3c756e439f68b1dc8e1 (diff) | |
| parent | 919ef5de2858e606d4a9be3e0e995b0802c76e33 (diff) | |
| download | otp-9cccec48c38544df1d00230aeb340b37890ab8c8.tar.gz otp-9cccec48c38544df1d00230aeb340b37890ab8c8.tar.bz2 otp-9cccec48c38544df1d00230aeb340b37890ab8c8.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
vsn -> 2.1.1
Update appup and code_change for ERIERL-83
Fix missing monitor in diameter_reg
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index cd0aa634e7..e4cb101a4f 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,23 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 9.1.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fixed bug that could cause a VM crash when a corrupt + message is received on distribution channel from other + node.</p> + <p> + Own Id: OTP-14661 Aux Id: ERIERL-80 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 9.1.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 1c6472a0ab..3d7ff2db66 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.1.1 +VSN = 9.1.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |