aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/unix
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-07-05 11:18:45 +0200
committerHans Nilsson <[email protected]>2015-07-05 11:18:45 +0200
commitddc7ce9124a8fb03bb95b5d550812c34f4177946 (patch)
tree91f489c0a8ba1ba6f30396809636020090fa8f06 /erts/etc/unix
parent99003f395207a23935bfd2859f9c7121da5110eb (diff)
parent9931cad6d5f653a8be2bb324450c1d4b2c5637cf (diff)
downloadotp-ddc7ce9124a8fb03bb95b5d550812c34f4177946.tar.gz
otp-ddc7ce9124a8fb03bb95b5d550812c34f4177946.tar.bz2
otp-ddc7ce9124a8fb03bb95b5d550812c34f4177946.zip
Merge branch 'hans/ssh/no_common_algs/OTP-11531' into maint
* hans/ssh/no_common_algs/OTP-11531: ssh: be more generous about disconnect expects ssh: add disjunction to ssh_trpt_test_lib:match
Diffstat (limited to 'erts/etc/unix')
0 files changed, 0 insertions, 0 deletions