aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_basic_SUITE.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-07-20 14:09:36 +0200
committerErlang/OTP <[email protected]>2018-07-20 14:09:36 +0200
commitc836bcd577762cef4b8475a7b6ad1bdf7aba9332 (patch)
tree71e46fd9f05bbb08485b40a3bc7eab1d5eaedefb /lib/ssl/test/ssl_basic_SUITE.erl
parent4f5729d3d2618e07d6e23dacbdcd57e2b51fc113 (diff)
parentdcd0547dd2e1a78f89dced3ca5918ae539b11de3 (diff)
downloadotp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.tar.gz
otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.tar.bz2
otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.zip
Merge branch 'ingela/ssl/engine-vs-certfile/ERLERL-211/OTP-15193' into maint-20
* ingela/ssl/engine-vs-certfile/ERLERL-211/OTP-15193: ssl: Engine key trumps certfile option
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
0 files changed, 0 insertions, 0 deletions