diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-07 09:43:05 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-07 09:43:05 +0200 |
| commit | 61b1abd20322ad4f05eab7d53c333c6a1e91c296 (patch) | |
| tree | d9f947c332c10bc5f822d1b44552da274b2dcc13 /.mailmap | |
| parent | db0d3b200ed9b3ca0f63ecb1901c304a5560b035 (diff) | |
| parent | 566773292d5e1a9dfdcfeda348b908c22952f9de (diff) | |
| download | otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.tar.gz otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.tar.bz2 otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.zip | |
Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts' into maint
* ingela/ssl/ssl_basic_SUITE-timeouts:
ssl: Tune timeout
ssl: Consistent timeout handling
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions