aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_manager.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-11-07 10:57:32 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-11-07 10:57:32 +0100
commita8f4d0d3a95f2b94bff496b25797c15cf7154d85 (patch)
tree7b24d9ab86aece45ecf61ead9fa75c1e6958591c /lib/ssl/src/ssl_manager.erl
parent2dc2442055672245b612552bd767c8d4e09bc7ae (diff)
parent5d19d638d164f39e6d060ab834fc30cb42252876 (diff)
downloadotp-a8f4d0d3a95f2b94bff496b25797c15cf7154d85.tar.gz
otp-a8f4d0d3a95f2b94bff496b25797c15cf7154d85.tar.bz2
otp-a8f4d0d3a95f2b94bff496b25797c15cf7154d85.zip
Merge branch 'egil/erts/cuddle-tests' into maint
* egil/erts/cuddle-tests: stdlib: Increase timeouts in ets_SUITE stdlib: Increase timeouts in rand_SUITE stdlib: Increase timeouts in base64_SUITE erts: Use cmd on windows for port_SUITE
Diffstat (limited to 'lib/ssl/src/ssl_manager.erl')
0 files changed, 0 insertions, 0 deletions