diff options
author | Erlang/OTP <[email protected]> | 2018-02-21 15:09:46 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-02-21 15:09:46 +0100 |
commit | d42ff869391cea3cec9224077f33cf33f58e41be (patch) | |
tree | 69a89094f3bce2f04fae1b23e953276c3cac13d6 /lib/ssh/src/sshd_sup.erl | |
parent | 309ef748ddc5bde4bcba280ce2739385f27a76e6 (diff) | |
parent | 83cd7724b244a4d5dd3efbdbb66811e781136ac9 (diff) | |
download | otp-d42ff869391cea3cec9224077f33cf33f58e41be.tar.gz otp-d42ff869391cea3cec9224077f33cf33f58e41be.tar.bz2 otp-d42ff869391cea3cec9224077f33cf33f58e41be.zip |
Merge branch 'hans/ssh/supervisor_timeout/OTP-14907' into maint-20
* hans/ssh/supervisor_timeout/OTP-14907:
ssh: Dont repeat supervisor defaults in map fields
ssh: Move starting of channel child to ssh_channel_sup
ssh: Test case for sup tree when shell server proc times out
Diffstat (limited to 'lib/ssh/src/sshd_sup.erl')
-rw-r--r-- | lib/ssh/src/sshd_sup.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl index c23e65d955..779a861a54 100644 --- a/lib/ssh/src/sshd_sup.erl +++ b/lib/ssh/src/sshd_sup.erl @@ -90,10 +90,8 @@ init(_) -> child_spec(Address, Port, Profile, Options) -> #{id => id(Address, Port, Profile), start => {ssh_system_sup, start_link, [Address, Port, Profile, Options]}, - restart => temporary, - shutdown => infinity, - type => supervisor, - modules => [ssh_system_sup] + restart => temporary, + type => supervisor }. id(Address, Port, Profile) -> |