diff options
| author | Rickard Green <[email protected]> | 2019-01-16 11:46:43 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-01-16 11:46:43 +0100 |
| commit | d8a93cc52fe7342e4a79e396192f63ea673b98f4 (patch) | |
| tree | e523f499a1c4fd832a3aa922d624567b77c0d103 /erts | |
| parent | 04c4d7ec3ea8863b7763ffdf5ba75b0404aee3b6 (diff) | |
| parent | 3f4b17036bb6dbd302da3c38830512439b146e34 (diff) | |
| download | otp-d8a93cc52fe7342e4a79e396192f63ea673b98f4.tar.gz otp-d8a93cc52fe7342e4a79e396192f63ea673b98f4.tar.bz2 otp-d8a93cc52fe7342e4a79e396192f63ea673b98f4.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 | 22 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index e4ff9b45c9..7d3b15c639 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,28 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 10.2.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fixed a crash when dangling files were closed after + <c>init:restart/0</c>.</p> + <p> + Own Id: OTP-15495 Aux Id: ERL-821 </p> + </item> + <item> + <p> + A bug that could cause dirty schedulers to become + unresponsive has been fixed.</p> + <p> + Own Id: OTP-15509 Aux Id: PR-2027, PR-2093 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.2.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 73199cc721..c579b6364a 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.2.1 +VSN = 10.2.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |