aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/sys.h
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-07-02 13:44:45 +0200
committerErlang/OTP <[email protected]>2019-07-02 13:44:45 +0200
commitcab74c43de624df3de3810128a1e3240e8e0f2b3 (patch)
tree7d7d62ac35913b2a89512d0918fb8149c0153c63 /erts/emulator/beam/sys.h
parent7e5af024d07418ddc9c1e7068bf1aa2d99e1b178 (diff)
parent1f3dde12d06bb325f51ecba2bbd48b4040474136 (diff)
downloadotp-cab74c43de624df3de3810128a1e3240e8e0f2b3.tar.gz
otp-cab74c43de624df3de3810128a1e3240e8e0f2b3.tar.bz2
otp-cab74c43de624df3de3810128a1e3240e8e0f2b3.zip
Merge branch 'ingela/ssl/TLS-hibernate-bug/OTP-15910' into maint-21
* ingela/ssl/TLS-hibernate-bug/OTP-15910: ssl: Fix hibernation bug # Conflicts: # lib/ssl/src/tls_connection.erl
Diffstat (limited to 'erts/emulator/beam/sys.h')
0 files changed, 0 insertions, 0 deletions