aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2017-06-05 10:23:09 +0200
committerLars Thorsen <[email protected]>2017-06-05 10:23:09 +0200
commit3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba (patch)
tree87ddf34e763c39250d394564c23c169fc612ce25 /erts
parent5b014a2d416f8a18fcd17c031d680a32bc6473d8 (diff)
parent645371eb3a5cdcdbf73bde2ec906181ec701e1cf (diff)
downloadotp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.tar.gz
otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.tar.bz2
otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 08f6732036..8ae87ac280 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,26 @@
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 8.3.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Add option to make SIGTERM trigger the OS default
+ behaviour instead of doing a gracefull shutdown. To
+ activate this bahviour the environment variable
+ ERL_ZZ_SIGTERM_KILL should be set to "true". This option
+ only works in OTP 19 as OTP 20 will have a different way
+ to deal with SIGTERM.</p>
+ <p>
+ Own Id: OTP-14418 Aux Id: ERIERL-15 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 8.3.3</title>
<section><title>Fixed Bugs and Malfunctions</title>