diff options
| author | Siri Hansen <[email protected]> | 2013-04-19 10:57:55 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-19 10:57:55 +0200 |
| commit | eb325ef3414c7c019eb9541e8d6ab4ce46632e65 (patch) | |
| tree | ed7ae228584fda71d7379106d98827b4164875a1 /make/make_emakefile | |
| parent | b31b467e902c978284eaeca6a23e336d2301f42a (diff) | |
| parent | afb553a6d776ff751311b950a96b2708a9ee292b (diff) | |
| download | otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.tar.gz otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.tar.bz2 otp-eb325ef3414c7c019eb9541e8d6ab4ce46632e65.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[common_test] Adjusted timers in ct_repeat_testrun_SUITE
[common_test] Extend timer in cover_SUITE for slow test host
[sasl] Remove compiler warning in release_handler_SUITE
[common_test] Kill slave nodes after test cases in cover_SUITE
[reltool] Remove erlang:port_close/1 for node port
Diffstat (limited to 'make/make_emakefile')
0 files changed, 0 insertions, 0 deletions