aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-06 16:14:49 +0100
committerRickard Green <[email protected]>2019-03-06 16:14:49 +0100
commit50a2582b39507149452d298129616a7d5feafbf2 (patch)
tree4be8fb9c3652852a1ebc68d2a43bfa53b69333d6 /lib/kernel/src
parentdd606f4c814c43e0a4f0a109b6c5220e4f99775c (diff)
parent5575fb4d3ced54d6ed8a0afababccb1fe78c77c0 (diff)
downloadotp-50a2582b39507149452d298129616a7d5feafbf2.tar.gz
otp-50a2582b39507149452d298129616a7d5feafbf2.tar.bz2
otp-50a2582b39507149452d298129616a7d5feafbf2.zip
Merge branch 'maint'
* maint: 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 4b48f6cd1d..e69a47b031 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -147,6 +147,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"]}
]
}.