diff options
author | Ingela Anderton Andin <[email protected]> | 2016-09-14 09:49:25 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-09-14 09:49:25 +0200 |
commit | 548a59177c1a5eb2a73cbf7d57f988326b05f8a6 (patch) | |
tree | 2d06af6f2681871bc531abd3c95eed4d87bc73fc /erts/emulator/sys | |
parent | ec56f41f7a48055896037ac77927b99202371e62 (diff) | |
parent | 76e01b7cb9192b75773db051c665d3080bf960b0 (diff) | |
download | otp-548a59177c1a5eb2a73cbf7d57f988326b05f8a6.tar.gz otp-548a59177c1a5eb2a73cbf7d57f988326b05f8a6.tar.bz2 otp-548a59177c1a5eb2a73cbf7d57f988326b05f8a6.zip |
Merge branch 'ingela/ssl/packet-tests' into maint
* ingela/ssl/packet-tests:
ssl: Add timetrap scale calls
ssl: Add nodelay to packet=0|raw tests
Diffstat (limited to 'erts/emulator/sys')
0 files changed, 0 insertions, 0 deletions