aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-05-28 09:20:41 +0200
committerIngela Anderton Andin <[email protected]>2014-05-28 09:20:41 +0200
commit54ba6869f4807a5b70868eb0204900d9de0d9f43 (patch)
treeedfa73db766097db5effb014fb2a060b94adec51 /lib/kernel
parentfbf868910593b74776eba6a0c970b123502a759e (diff)
parenta2eb7ee1cd9cc19f1c4c14ad7ff4e70de05bfe96 (diff)
downloadotp-54ba6869f4807a5b70868eb0204900d9de0d9f43.tar.gz
otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.tar.bz2
otp-54ba6869f4807a5b70868eb0204900d9de0d9f43.zip
Merge branch 'ia/ssl/improved-options-handling/OTP-11950' into maint
* ia/ssl/improved-options-handling/OTP-11950: ssl: Correct test SUITE ssl: Add format_status function to ssl connection process inets: Correct httpc_SUITE ssl: Add ssl options to listen options tracker ssl: Move init
Diffstat (limited to 'lib/kernel')
0 files changed, 0 insertions, 0 deletions