aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-09-18 14:38:58 +0200
committerSverker Eriksson <[email protected]>2018-09-18 14:38:58 +0200
commit990c25dc1265c0450ecb47ca73116ccb72a246c8 (patch)
tree4cec06b76454f0bb9bbe44e7f5cf3778d1abaf86 /erts/preloaded
parent59b49c6a5bc8053db97a27029ecf5245784b45fc (diff)
parent06a5b038c1fb5f722b7f691488aaf18981f1344f (diff)
downloadotp-990c25dc1265c0450ecb47ca73116ccb72a246c8.tar.gz
otp-990c25dc1265c0450ecb47ca73116ccb72a246c8.tar.bz2
otp-990c25dc1265c0450ecb47ca73116ccb72a246c8.zip
Merge branch 'sverker/erts/robustify-dist-entry-states/OTP-15297' into maint
* sverker/erts/robustify-dist-entry-states/OTP-15297: erts: Refactor port dist_entry & conn_id into PRTSD Remove ugly fail case macros Consolidate distribution entry state transitions erts: Fix bug in undocumented system_flag(scheduling_statistics)
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/erts.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 1ccc4988c2..8c34c99a98 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -38,7 +38,7 @@
{registered, []},
{applications, []},
{env, []},
- {runtime_dependencies, ["stdlib-3.5", "kernel-6.0", "sasl-3.0.1"]}
+ {runtime_dependencies, ["stdlib-3.5", "kernel-6.1", "sasl-3.0.1"]}
]}.
%% vim: ft=erlang