diff options
author | Zandra Hird <[email protected]> | 2015-05-05 15:03:26 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-05-05 15:06:07 +0200 |
commit | 66260d0606fcbaad3d5179288fea90cfe546cbbe (patch) | |
tree | 03859862bc2b6d482cfffddca6fa2d65b99ba9a5 /erts/etc | |
parent | d6421c98edf2cdd5c3e27c2c7f7a2f59b17487ab (diff) | |
parent | c08c4a88a73453bd60fb93d0462482a6afc50544 (diff) | |
download | otp-66260d0606fcbaad3d5179288fea90cfe546cbbe.tar.gz otp-66260d0606fcbaad3d5179288fea90cfe546cbbe.tar.bz2 otp-66260d0606fcbaad3d5179288fea90cfe546cbbe.zip |
Merge branch 'dotsimon/ssh_sftp_version_negotiation_timeout'
OTP-12708
Diffstat (limited to 'erts/etc')
0 files changed, 0 insertions, 0 deletions