aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-03-02 13:32:28 +0100
committerHenrik Nord <[email protected]>2016-03-02 13:37:07 +0100
commit52da57c29bc18ff103cb5382625342b4a8f0c7cf (patch)
treea4f98bb9847ff98883822fcf525167de5a5c1f80 /erts/epmd
parent1717a8f9e04e6dbfed5921bea1e27ed748ad278f (diff)
parentfac6b24525a1e5f3e50ee9cbdb4daae2ea457f51 (diff)
downloadotp-52da57c29bc18ff103cb5382625342b4a8f0c7cf.tar.gz
otp-52da57c29bc18ff103cb5382625342b4a8f0c7cf.tar.bz2
otp-52da57c29bc18ff103cb5382625342b4a8f0c7cf.zip
Merge branch 'legoscia/tls_ipv6_dist' into maint
* legoscia/tls_ipv6_dist: Add inet6_tls_dist, for TLS distribution over IPv6 Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl OTP-13391
Diffstat (limited to 'erts/epmd')
0 files changed, 0 insertions, 0 deletions