diff options
| author | Lukas Larsson <[email protected]> | 2018-02-26 17:57:53 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-02-26 17:57:53 +0100 |
| commit | 1a0b238c5389e7f39724d390e2e592638b005c47 (patch) | |
| tree | 015827e3c7a03bd434a4f5e474f50ddb83702053 /erts | |
| parent | 16bbe6153f47005430a59eae901b8f6421fd4ebf (diff) | |
| parent | 8bc23cd3da3c5c80a401bfea0738c007dbd21f85 (diff) | |
| download | otp-1a0b238c5389e7f39724d390e2e592638b005c47.tar.gz otp-1a0b238c5389e7f39724d390e2e592638b005c47.tar.bz2 otp-1a0b238c5389e7f39724d390e2e592638b005c47.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/test/z_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl index b3d0ba20bc..bb1afecafc 100644 --- a/erts/test/z_SUITE.erl +++ b/erts/test/z_SUITE.erl @@ -40,7 +40,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap, {minutes, 5}}]. + {timetrap, {minutes, 10}}]. all() -> [core_files]. |