diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-16 10:48:12 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-16 10:48:12 +0200 |
| commit | a12b70fa98eee10650c9de78d7d91516a2989999 (patch) | |
| tree | 016d7910e943c7a98710589063e116596da53545 /.gitattributes | |
| parent | e802c5d8152440cc59003f04271f7f1934453db4 (diff) | |
| parent | 82aafa295a4004bcbd549c5bb888907e3ffc0c97 (diff) | |
| download | otp-a12b70fa98eee10650c9de78d7d91516a2989999.tar.gz otp-a12b70fa98eee10650c9de78d7d91516a2989999.tar.bz2 otp-a12b70fa98eee10650c9de78d7d91516a2989999.zip | |
Merge branch 'ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832' into maint
* ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832:
ssl: Better timeout gaurds
ssl: Improve shutdown logic
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions