aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.app.src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-03-02 14:35:35 +0100
committerHenrik Nord <[email protected]>2016-03-02 14:35:35 +0100
commit1729b7eb1c52b7c03ce3cc532afaaab370412298 (patch)
tree6fb8a574d1c630b285d382381bf57b2c7917da47 /lib/ssl/src/ssl.app.src
parent01793d6e6b4e194d667cd31cb64e21af562b48f3 (diff)
parent52da57c29bc18ff103cb5382625342b4a8f0c7cf (diff)
downloadotp-1729b7eb1c52b7c03ce3cc532afaaab370412298.tar.gz
otp-1729b7eb1c52b7c03ce3cc532afaaab370412298.tar.bz2
otp-1729b7eb1c52b7c03ce3cc532afaaab370412298.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
-rw-r--r--lib/ssl/src/ssl.app.src1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 619ab7b610..1a2bf90ccf 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -31,6 +31,7 @@
ssl_listen_tracker_sup,
%% Erlang Distribution over SSL/TLS
inet_tls_dist,
+ inet6_tls_dist,
ssl_tls_dist_proxy,
ssl_dist_sup,
%% SSL/TLS session handling