diff options
author | Ingela Anderton Andin <[email protected]> | 2017-08-14 11:06:17 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-08-14 11:06:17 +0200 |
commit | 95b567a7286a1e94bc799c6817f7bf8d5c52fe41 (patch) | |
tree | e1bf64d950e2e64e8c6dcb1e1652a2d011ec13f7 /lib/observer/Makefile | |
parent | 5322f7cf67498f364d053fd7c49c0c5858f1d0fa (diff) | |
parent | 46699596465e9ff49c2c2394311e7899132a2132 (diff) | |
download | otp-95b567a7286a1e94bc799c6817f7bf8d5c52fe41.tar.gz otp-95b567a7286a1e94bc799c6817f7bf8d5c52fe41.tar.bz2 otp-95b567a7286a1e94bc799c6817f7bf8d5c52fe41.zip |
Merge branch 'ingela/ssl/timeout-cuddle' into maint
* ingela/ssl/timeout-cuddle:
ssl: Longer timeouts for test cases that do many handshakes
Diffstat (limited to 'lib/observer/Makefile')
0 files changed, 0 insertions, 0 deletions