aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-09-06 11:14:12 +0200
committerIngela Anderton Andin <[email protected]>2016-09-06 11:14:12 +0200
commitdd2919dc29d3eb0d287522c7485bf42343173937 (patch)
tree4b699fedb7732ecb25849e99d997af6033c86b98 /erts
parenteaa2743cd558e409b091c9dfb3852197d89edf1c (diff)
parent87cb991bda12ce1b7b2f4ddc485a96c263fc7b05 (diff)
downloadotp-dd2919dc29d3eb0d287522c7485bf42343173937.tar.gz
otp-dd2919dc29d3eb0d287522c7485bf42343173937.tar.bz2
otp-dd2919dc29d3eb0d287522c7485bf42343173937.zip
Merge branch 'ingela/ssl/ssl_to_openssl_SUITE' into maint
* ingela/ssl/ssl_to_openssl_SUITE: ssl: Make sure to have correct default
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions