diff options
| author | Erlang/OTP <[email protected]> | 2019-04-15 10:58:43 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-04-15 10:58:43 +0200 |
| commit | 46892d7c06810946524d0f4496f0df7ff1e6086c (patch) | |
| tree | ef449b5753e1f64cb3b89357e39de4b900e39593 /erts | |
| parent | b8fb70d323eac2c00038e9f9b036a4da34aba05d (diff) | |
| parent | e160c628f4305dd603c24ab6d208db57ce15b23b (diff) | |
| download | otp-46892d7c06810946524d0f4496f0df7ff1e6086c.tar.gz otp-46892d7c06810946524d0f4496f0df7ff1e6086c.tar.bz2 otp-46892d7c06810946524d0f4496f0df7ff1e6086c.zip | |
Merge branch 'peterdmv/inets/fix_erl_script_timeout/ERIERL-345/OTP-15769' into maint-21
* peterdmv/inets/fix_erl_script_timeout/ERIERL-345/OTP-15769:
inets: Add tests for erl_script_timeout
inets: Fix erl_script_timeout handling in mod_esi
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions