diff options
| author | Siri Hansen <[email protected]> | 2016-06-18 15:38:13 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-06-18 15:38:13 +0200 |
| commit | f2880af6d8cd9b81507fd8b3074b6350e561e5c3 (patch) | |
| tree | 005f229bc035d17f6236097557cc07a734ac1a73 /system | |
| parent | 5209278192e4c7762b7f2d5a311c13a4596cb4d4 (diff) | |
| parent | e61d7eb7ed8a1425daf8948ae0ba882cebc4946f (diff) | |
| download | otp-f2880af6d8cd9b81507fd8b3074b6350e561e5c3.tar.gz otp-f2880af6d8cd9b81507fd8b3074b6350e561e5c3.tar.bz2 otp-f2880af6d8cd9b81507fd8b3074b6350e561e5c3.zip | |
Merge branch 'siri/cuddle-master'
* siri/cuddle-master:
[ct test] Catch call to ssh:start/0
[sasl test] Do GC before measuring and comparing time
[sasl test] Give some time and try again if nodes are not synched
Diffstat (limited to 'system')
0 files changed, 0 insertions, 0 deletions