diff options
author | Ingela Anderton Andin <[email protected]> | 2014-09-22 15:37:46 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-09-22 15:37:46 +0200 |
commit | c02166a6fccac8b6108a99a6bd95ffad6ac6f709 (patch) | |
tree | 43616a3f1f7f4654ffcaa52c32702728bbed43d9 /erts/preloaded | |
parent | 1409a50a677ed48f236307276b79329574d91ac9 (diff) | |
parent | e00e62392040ddc328cd0581b4743a4edebe25ab (diff) | |
download | otp-c02166a6fccac8b6108a99a6bd95ffad6ac6f709.tar.gz otp-c02166a6fccac8b6108a99a6bd95ffad6ac6f709.tar.bz2 otp-c02166a6fccac8b6108a99a6bd95ffad6ac6f709.zip |
Merge branch 'ia/ssh/cuddle-tests' into maint
* ia/ssh/cuddle-tests:
ssh: Avoid windows wierdness
ssh: Avoid timeout of init_per_test_case on some platforms
Diffstat (limited to 'erts/preloaded')
0 files changed, 0 insertions, 0 deletions