aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-12-15 09:43:06 +0100
committerErlang/OTP <[email protected]>2015-12-15 09:43:06 +0100
commit252b3d9e410f834b7643fd4ca03e8a108994158f (patch)
tree83d902f89961f42900bbe71bad0130d26d37b344 /lib/kernel
parent8feea6e7ff910a32accb5587a2245f5725d7b38c (diff)
parent4b45171ef63418a1739238e68d9a95abe14d93fd (diff)
downloadotp-252b3d9e410f834b7643fd4ca03e8a108994158f.tar.gz
otp-252b3d9e410f834b7643fd4ca03e8a108994158f.tar.bz2
otp-252b3d9e410f834b7643fd4ca03e8a108994158f.zip
Merge branch 'siri/appups-18.2' into maint
* siri/appups-18.2: Update appups in kernel, stdlib and sasl for OTP-18.2
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/kernel.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 3fda55d1a9..860d3640d0 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,9 +18,9 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"4\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.*
+ [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
%% Down to - max one major revision back
- [{<<"4\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.*
+ [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
}.