diff options
author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:03:44 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:03:44 +0100 |
commit | ba9f5c79c77806c199d2bd839c0c19e9da3cdeec (patch) | |
tree | fadc056dcce0587ea9c8fb414a526f0c096bb9e3 /lib/ssl/src/ssl_dist_sup.erl | |
parent | 57e0fb97e74c48c502b2eb35990abf4396e04b52 (diff) | |
parent | b91e7498e625b4e6419238f753c30b509fb958d2 (diff) | |
download | otp-ba9f5c79c77806c199d2bd839c0c19e9da3cdeec.tar.gz otp-ba9f5c79c77806c199d2bd839c0c19e9da3cdeec.tar.bz2 otp-ba9f5c79c77806c199d2bd839c0c19e9da3cdeec.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_dist_sup.erl')
-rw-r--r-- | lib/ssl/src/ssl_dist_sup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl index a6eb1be1f6..d47cd76bf5 100644 --- a/lib/ssl/src/ssl_dist_sup.erl +++ b/lib/ssl/src/ssl_dist_sup.erl @@ -85,10 +85,10 @@ proxy_server_child_spec() -> {Name, StartFunc, Restart, Shutdown, Type, Modules}. listen_options_tracker_child_spec() -> - Name = ssl_socket_dist, + Name = tls_socket_dist, StartFunc = {ssl_listen_tracker_sup, start_link_dist, []}, Restart = permanent, Shutdown = 4000, - Modules = [ssl_socket], + Modules = [tls_socket], Type = supervisor, {Name, StartFunc, Restart, Shutdown, Type, Modules}. |