diff options
| author | John Högberg <[email protected]> | 2018-11-16 12:31:50 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-11-16 12:31:50 +0100 |
| commit | 5503d96504a89b1b00a78f7e7d12e79be553b215 (patch) | |
| tree | 48c8f10925f72eb41f7aea33638d7e11d0910d3b /erts | |
| parent | 200c2718e16c9186f3b4cdccaf989a31946a3f20 (diff) | |
| parent | db35a04a38f9501b921beac2c46576c5fa13e75a (diff) | |
| download | otp-5503d96504a89b1b00a78f7e7d12e79be553b215.tar.gz otp-5503d96504a89b1b00a78f7e7d12e79be553b215.tar.bz2 otp-5503d96504a89b1b00a78f7e7d12e79be553b215.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 1b165e885c..f384adcf52 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,22 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 10.1.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fixed a rare bug where files could be closed on a + normal instead of an IO scheduler, resulting in system + instability if the operation blocked.</p> + <p> + Own Id: OTP-15421</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.1.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 01c19aff2f..241d5a3b85 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.1.1 +VSN = 10.1.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |