diff options
| author | Siri Hansen <[email protected]> | 2013-03-14 10:57:39 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-03-14 10:57:39 +0100 |
| commit | e2ee1f79a7d0ffe02eab4da90d655e77893d1666 (patch) | |
| tree | aff42174e9798e056e9f34c2c57b77649a0b9a9d /erts | |
| parent | e5df75bfc94662ffe9c36e0b1643cef0104586e0 (diff) | |
| parent | 0541bbab72df88b91d5725ad209aef1a951a4448 (diff) | |
| download | otp-e2ee1f79a7d0ffe02eab4da90d655e77893d1666.tar.gz otp-e2ee1f79a7d0ffe02eab4da90d655e77893d1666.tar.bz2 otp-e2ee1f79a7d0ffe02eab4da90d655e77893d1666.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[sasl] Fix tests that compare execution time
[jinterface] Kill process between tests to avoid consequential error
[jinterface] Make tests handle space in path on windows
[common_test] Extend timers for slave nodes in ct_cover_SUITE
[test_server] Clean up unused code in test_server_SUITE
[reltool] Increase timetrap timeout for reltool_server_SUTIE to 10 minutes
[test_server] Fix encoding of HTML file references to work on windows
[test_server] Use simpler tc name in unicode test to make it work on windows
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions