diff options
| author | Zandra <[email protected]> | 2015-11-24 10:41:03 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-24 10:41:03 +0100 |
| commit | 82faec2369f8a13311e3a472788d19cc2bce6337 (patch) | |
| tree | 779c70d8dd831bd54d8583a99b721e186432e72c | |
| parent | 9d2acfb6ad3184c150a9e91520cd320c83e952b4 (diff) | |
| parent | 517a545d9de0a434c486de1acdc891c6fc8e3309 (diff) | |
| download | otp-82faec2369f8a13311e3a472788d19cc2bce6337.tar.gz otp-82faec2369f8a13311e3a472788d19cc2bce6337.tar.bz2 otp-82faec2369f8a13311e3a472788d19cc2bce6337.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_dist_sup.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index b6e62a18c9..404ae93d20 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -30,7 +30,7 @@ childspecs() -> {ok, [{ssl_dist_sup,{ssl_dist_sup, start_link, []}, - permanent, 2000, worker, [ssl_dist_sup]}]}. + permanent, infinity, supervisor, [ssl_dist_sup]}]}. select(Node) -> case split_node(atom_to_list(Node), $@, []) of diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl index aa1fa57db8..435ad27a44 100644 --- a/lib/ssl/src/ssl_dist_sup.erl +++ b/lib/ssl/src/ssl_dist_sup.erl @@ -70,7 +70,7 @@ connection_manager_child_spec() -> Name = ssl_connection_dist, StartFunc = {tls_connection_sup, start_link_dist, []}, Restart = permanent, - Shutdown = 4000, + Shutdown = infinity, Modules = [tls_connection_sup], Type = supervisor, {Name, StartFunc, Restart, Shutdown, Type, Modules}. |