aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-12-19 11:18:12 +0100
committerIngela Anderton Andin <[email protected]>2016-12-19 11:18:12 +0100
commit1715b9284643150da0f3ea43df42df1a4a90e144 (patch)
treed2c8897e36a290ade1a70aea178b6d138c168bcb /erts/emulator
parenta92eef5de3c1978d005747394473ba9fcab6407c (diff)
parentdd985c2097a29ca0812fdf6f0431aed2d8a7c752 (diff)
downloadotp-1715b9284643150da0f3ea43df42df1a4a90e144.tar.gz
otp-1715b9284643150da0f3ea43df42df1a4a90e144.tar.bz2
otp-1715b9284643150da0f3ea43df42df1a4a90e144.zip
Merge branch 'ingela/ssl/terminate/OTP-14100' into maint
* ingela/ssl/terminate/OTP-14100: ssl: Correct terminate behaviour
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions