aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-06 16:13:50 +0100
committerRickard Green <[email protected]>2019-03-06 16:13:50 +0100
commit5575fb4d3ced54d6ed8a0afababccb1fe78c77c0 (patch)
tree2bcc14db2b74cc65a9891bf1d5d8b1bb779f2a1a /lib/kernel/src
parent04279c3f707d7d9fac4e980fc1eb467638f7b5f5 (diff)
parent7ce81a64c9f8076738adc51a4de2260b5b021c3e (diff)
downloadotp-5575fb4d3ced54d6ed8a0afababccb1fe78c77c0.tar.gz
otp-5575fb4d3ced54d6ed8a0afababccb1fe78c77c0.tar.bz2
otp-5575fb4d3ced54d6ed8a0afababccb1fe78c77c0.zip
Merge branch 'lukas/erts/fix_inet_buffer_auto_adjust/OTP-15651/OTP-15652' into maint
* 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.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index a1d9e8e215..d842e96fce 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -148,6 +148,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"]}
]
}.