diff options
| author | Erlang/OTP <[email protected]> | 2016-08-04 16:09:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-08-04 16:09:03 +0200 |
| commit | 8ec225e35702933de417df4e77f09415e30df50b (patch) | |
| tree | 3a4f5b6435389289d8de5d0f80763245c76766ef /lib/ssh/src | |
| parent | f5ef4087331c0181fd154dcaa372a05e6f8bd408 (diff) | |
| parent | d732b4b8abfe59d1ac5ec475633ca08501341a49 (diff) | |
| download | otp-8ec225e35702933de417df4e77f09415e30df50b.tar.gz otp-8ec225e35702933de417df4e77f09415e30df50b.tar.bz2 otp-8ec225e35702933de417df4e77f09415e30df50b.zip | |
Merge branch 'hans/ssh/sup_fix_ssh_supc_type/OTP-13782' into maint-18
* hans/ssh/sup_fix_ssh_supc_type/OTP-13782:
ssh: update test suite for supervisors
ssh: sshc_sup to use worker for ssh_con_handler
ssh: update version number
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/sshc_sup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/sshc_sup.erl b/lib/ssh/src/sshc_sup.erl index 8ee6aacfb5..b8275ba1eb 100644 --- a/lib/ssh/src/sshc_sup.erl +++ b/lib/ssh/src/sshc_sup.erl @@ -64,7 +64,7 @@ child_spec(_) -> Name = undefined, % As simple_one_for_one is used. StartFunc = {ssh_connection_handler, start_link, []}, Restart = temporary, - Shutdown = infinity, + Shutdown = 4000, Modules = [ssh_connection_handler], - Type = supervisor, + Type = worker, {Name, StartFunc, Restart, Shutdown, Type, Modules}. |