aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src/ssl.xml
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-06-07 09:45:01 +0200
committerLukas Larsson <[email protected]>2016-06-07 09:45:01 +0200
commitac18b8705c78be8bec5bdc14c412af2ced740916 (patch)
treef6a0a03215e409bb82f3087d9363c06d593de16f /lib/ssl/doc/src/ssl.xml
parentd26c15e07229c90ba8353bd78d5406ada0f13271 (diff)
parent85996c92853e90cb233a1405b1c8c7bb1b8ca54e (diff)
downloadotp-ac18b8705c78be8bec5bdc14c412af2ced740916.tar.gz
otp-ac18b8705c78be8bec5bdc14c412af2ced740916.tar.bz2
otp-ac18b8705c78be8bec5bdc14c412af2ced740916.zip
Merge branch 'dotsimon/erts/heart_no_kill/OTP-13650'
* dotsimon/erts/heart_no_kill/OTP-13650: erts: make HEART_NO_KILL have to be set to TRUE Don't kill old erlang if HEART_NO_KILL is set Conflicts: lib/kernel/doc/src/heart.xml
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
0 files changed, 0 insertions, 0 deletions