diff options
| author | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:52 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:52 +0200 |
| commit | 91e6f3a30b8d6e779050f6e7fd418479bc9f9948 (patch) | |
| tree | 59d10763782021dc51ce7471f73f83ce93cf0a8f /erts | |
| parent | be44d6827e2374a43068b35de85ed16441c771be (diff) | |
| parent | abc64999241276879208d077f9d94101366a414e (diff) | |
| download | otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.tar.gz otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.tar.bz2 otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
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 248b871ca0..7c5a8aefad 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.3.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fixed a bug in <c>seq_trace:reset_trace/0</c> that + could crash the emulator.</p> + <p> + Own Id: OTP-15704</p> + </item> + <item> + <p> + Fixed bug in <c>process_info(reductions)</c> causing it + to sometimes return invalid results.</p> + <p> + Own Id: OTP-15709 Aux Id: ERIERL-337 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 10.3.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 3942af7f78..bce5ce4167 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.3.1 +VSN = 10.3.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |