diff options
author | Ingela Anderton Andin <[email protected]> | 2015-06-23 10:08:51 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-06-23 10:08:51 +0200 |
commit | 7cff27e14e051b6ee15f564335eb8e685e1639c1 (patch) | |
tree | b97f48f3482bd7f0651acdaab4eba69709a8c88f /erts/emulator/beam/erl_zlib.c | |
parent | c57c5c83acb3a21b52304bc53cbdf32e0dda3690 (diff) | |
parent | 566cbee917638f596c5d46bd0aff331a66f5c8d2 (diff) | |
download | otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.gz otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.bz2 otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.zip |
Merge branch 'ia/ssl/modern-timetrap'
* ia/ssl/modern-timetrap:
ssl: Make init functions fail if make_certs:all fails
ssl: Avoid sleep
ssl: modernize timetrap handling
Diffstat (limited to 'erts/emulator/beam/erl_zlib.c')
0 files changed, 0 insertions, 0 deletions