aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-07-03 09:35:21 +0200
committerIngela Anderton Andin <[email protected]>2015-07-03 09:35:21 +0200
commit51668da86a591681f230e76e4947249e318522a1 (patch)
tree8ab40386866a52430ec87e3c2e410b56b7e8aced /lib/diameter
parent92a0cf0cafb20181982554d9a95247c86f9db4e4 (diff)
parent37c12e0025c69bbcd19c4fa149a4c088c2181eed (diff)
downloadotp-51668da86a591681f230e76e4947249e318522a1.tar.gz
otp-51668da86a591681f230e76e4947249e318522a1.tar.bz2
otp-51668da86a591681f230e76e4947249e318522a1.zip
Merge branch 'ia/ssl/tune-tests' into maint
* ia/ssl/tune-tests: ssl: Exclude broken OpenSSL version from ECC test ssl: Tune timeouts
Diffstat (limited to 'lib/diameter')
0 files changed, 0 insertions, 0 deletions