diff options
| author | Siri Hansen <[email protected]> | 2016-06-01 15:04:09 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-06-01 15:04:09 +0200 |
| commit | 77b6b9a3c5d044a832ba36f8683bbe88279d8c88 (patch) | |
| tree | f0ee920f34102dcea446c94b5a52d2b19ac011ad /erts/emulator | |
| parent | d46e634b1c4ab0d88597c7bdff69a646a54f4477 (diff) | |
| parent | 1964b89cb2ce66841467c15ea135e1ee1a292709 (diff) | |
| download | otp-77b6b9a3c5d044a832ba36f8683bbe88279d8c88.tar.gz otp-77b6b9a3c5d044a832ba36f8683bbe88279d8c88.tar.bz2 otp-77b6b9a3c5d044a832ba36f8683bbe88279d8c88.zip | |
Merge branch 'siri/cuddle-master'
* siri/cuddle-master:
Change ct:sleep to timer:sleep where scaling is not wanted
Don't generate ssh key files in netconf client test
Ignore data received in break mode in test telnet_server
Wait for process to die before next call
Retry ct_telnet:get_data if no data is received after short wait
Don't throw rest of line when NOP is received in test telnet_server
Change ct:sleep to timer:sleep in telnet_server
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions