diff options
| author | Marcus Arendt <[email protected]> | 2014-11-12 10:03:45 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-12 10:03:45 +0100 |
| commit | e61f384adff0c9b134750ee239581296d25c10cd (patch) | |
| tree | 49943be69110215a353b8a0c2f68b47098d93ee1 /lib/os_mon/src/nteventlog.erl | |
| parent | e38e7f9bd7756037c9c42a4d97278fead0402629 (diff) | |
| parent | c854951a2bae920f4c1e4fd4073bc2ac69d5a3a9 (diff) | |
| download | otp-e61f384adff0c9b134750ee239581296d25c10cd.tar.gz otp-e61f384adff0c9b134750ee239581296d25c10cd.tar.bz2 otp-e61f384adff0c9b134750ee239581296d25c10cd.zip | |
Merge branch 'dotsimon/ssh_connect_timeout/OTP-12306' into maint
* dotsimon/ssh_connect_timeout/OTP-12306:
Fix ssh_sftp:start_channel timeout
Diffstat (limited to 'lib/os_mon/src/nteventlog.erl')
0 files changed, 0 insertions, 0 deletions