diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-18 09:25:11 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-18 09:25:11 +0200 |
| commit | 9b01223a5ff7e157c57ef832afc985662c97e123 (patch) | |
| tree | a6a8ba108259e256c73f814bfec70d030128789d /erts/lib | |
| parent | b5fc65bb0a959bd96c125ce523c41052bbc0c04d (diff) | |
| parent | 85276c69d9bf43ac85b4de3aacfc5f9baf15bcf0 (diff) | |
| download | otp-9b01223a5ff7e157c57ef832afc985662c97e123.tar.gz otp-9b01223a5ff7e157c57ef832afc985662c97e123.tar.bz2 otp-9b01223a5ff7e157c57ef832afc985662c97e123.zip | |
Merge branch 'ia/ssl/cuddle_tests' into maint
* ia/ssl/cuddle_tests:
ssl: Timeout tuning
Diffstat (limited to 'erts/lib')
0 files changed, 0 insertions, 0 deletions