diff options
| author | Erlang/OTP <[email protected]> | 2019-03-05 23:50:40 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-03-05 23:50:40 +0100 |
| commit | 3df9d80a0e83b8206a1ca0611451c12090ba471c (patch) | |
| tree | 4b31b869072154a1de00392828a8d5fd872a3c4f /lib/kernel/src | |
| parent | 3ec4257f6f93656d3f58f864ed8aa585788b7d0f (diff) | |
| parent | 7ce81a64c9f8076738adc51a4de2260b5b021c3e (diff) | |
| download | otp-3df9d80a0e83b8206a1ca0611451c12090ba471c.tar.gz otp-3df9d80a0e83b8206a1ca0611451c12090ba471c.tar.bz2 otp-3df9d80a0e83b8206a1ca0611451c12090ba471c.zip | |
Merge branch 'lukas/erts/fix_inet_buffer_auto_adjust/OTP-15651/OTP-15652' into maint-21
* lukas/erts/fix_inet_buffer_auto_adjust/OTP-15651/OTP-15652:
kernel runtime dependency to erts
erts: Add yield via timeout to inet read_packet
erts: Don't increase buffer when sctp sndbuf is set
erts: Only change inet buffer if not set
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/kernel.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src index fe073621c8..e234e85822 100644 --- a/lib/kernel/src/kernel.app.src +++ b/lib/kernel/src/kernel.app.src @@ -146,6 +146,6 @@ {logger_sasl_compatible, false} ]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-10.1", "stdlib-3.5", "sasl-3.0"]} + {runtime_dependencies, ["erts-@OTP-15651@", "stdlib-3.5", "sasl-3.0"]} ] }. |