diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-10-15 18:24:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-11-13 10:58:19 +0100 |
| commit | 68263a48bfbdac4dc219a91f06af3d535d881850 (patch) | |
| tree | f36d0cbb6c097faa7a17e8e6ee677f8262e8c924 /lib/ssh/src/ssh_system_sup.erl | |
| parent | d53cea682010766c82ba7088f40efcfafe196621 (diff) | |
| download | otp-68263a48bfbdac4dc219a91f06af3d535d881850.tar.gz otp-68263a48bfbdac4dc219a91f06af3d535d881850.tar.bz2 otp-68263a48bfbdac4dc219a91f06af3d535d881850.zip | |
ssh: Merge connection_manager and connection_handler processes
Also start adding dialyzer specs and removing dead code
Diffstat (limited to 'lib/ssh/src/ssh_system_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 36daf3b1ac..158a829eb0 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2012. All Rights Reserved. +%% Copyright Ericsson AB 2008-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -40,7 +40,7 @@ -export([init/1]). %%%========================================================================= -%%% API +%%% Internal API %%%========================================================================= start_link(ServerOpts) -> Address = proplists:get_value(address, ServerOpts), @@ -146,7 +146,7 @@ ssh_acceptor_child_spec(ServerOpts) -> ssh_subsystem_child_spec(ServerOpts) -> Name = make_ref(), StartFunc = {ssh_subsystem_sup, start_link, [ServerOpts]}, - Restart = transient, + Restart = temporary, Shutdown = infinity, Modules = [ssh_subsystem_sup], Type = supervisor, |