aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-05-05 15:03:26 +0200
committerZandra Hird <[email protected]>2015-05-05 15:06:07 +0200
commit66260d0606fcbaad3d5179288fea90cfe546cbbe (patch)
tree03859862bc2b6d482cfffddca6fa2d65b99ba9a5 /lib/observer
parentd6421c98edf2cdd5c3e27c2c7f7a2f59b17487ab (diff)
parentc08c4a88a73453bd60fb93d0462482a6afc50544 (diff)
downloadotp-66260d0606fcbaad3d5179288fea90cfe546cbbe.tar.gz
otp-66260d0606fcbaad3d5179288fea90cfe546cbbe.tar.bz2
otp-66260d0606fcbaad3d5179288fea90cfe546cbbe.zip
Merge branch 'dotsimon/ssh_sftp_version_negotiation_timeout'
OTP-12708
Diffstat (limited to 'lib/observer')
0 files changed, 0 insertions, 0 deletions