diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-26 08:59:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-26 08:59:52 +0200 |
| commit | e54518231ac28096dec8f0a63afe527916ff1343 (patch) | |
| tree | a1415c1f2be29ea679567a293e5f9b725a0fac16 /lib/erl_interface | |
| parent | 461dc05384eece7b4b7d84370fb0a2cf96ed2f6d (diff) | |
| parent | 87401c346717d12e64d5dc2c8b3715e322072535 (diff) | |
| download | otp-e54518231ac28096dec8f0a63afe527916ff1343.tar.gz otp-e54518231ac28096dec8f0a63afe527916ff1343.tar.bz2 otp-e54518231ac28096dec8f0a63afe527916ff1343.zip | |
Merge branch 'ia/inets/reload-tests-and-timeout-mixup/OTP-12013' into maint
* ia/inets/reload-tests-and-timeout-mixup/OTP-12013:
inets: Create seperate timeout for TLS/SSL handshake
inets: Add reload tests
Diffstat (limited to 'lib/erl_interface')
0 files changed, 0 insertions, 0 deletions