diff options
author | Hans Nilsson <[email protected]> | 2015-07-05 11:18:45 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-07-05 11:18:45 +0200 |
commit | ddc7ce9124a8fb03bb95b5d550812c34f4177946 (patch) | |
tree | 91f489c0a8ba1ba6f30396809636020090fa8f06 /lib/xmerl | |
parent | 99003f395207a23935bfd2859f9c7121da5110eb (diff) | |
parent | 9931cad6d5f653a8be2bb324450c1d4b2c5637cf (diff) | |
download | otp-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 'lib/xmerl')
0 files changed, 0 insertions, 0 deletions