aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra <[email protected]>2016-02-02 10:39:13 +0100
committerZandra <[email protected]>2016-02-02 10:39:13 +0100
commit0f15f90ef5f482b0e860e41438151a5d9c4859e7 (patch)
tree2cb7eaf82c08f3713f94bb5e9183bf76c068907d /erts
parent7ae14a1ad0ac38931d495453d627832c386cfa08 (diff)
parent81b63f2c3ffc9a1aee9e84de2e9875bf3acb6623 (diff)
downloadotp-0f15f90ef5f482b0e860e41438151a5d9c4859e7.tar.gz
otp-0f15f90ef5f482b0e860e41438151a5d9c4859e7.tar.bz2
otp-0f15f90ef5f482b0e860e41438151a5d9c4859e7.zip
Merge branch 'legoscia/tls-dist-connect-options' into maint
* legoscia/tls-dist-connect-options: ssl_dist_SUITE: don't use deprecated functions TLS distribution: support inet_dist_connect_options OTP-13285
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions