aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-11-27 14:54:42 +0100
committerSiri Hansen <[email protected]>2017-11-27 14:54:42 +0100
commit477f4a04e7d920982dd11d0fa6ee4fb7b7b5979f (patch)
treed99d9456213a045651cc614f3597612490345351 /lib/kernel
parent0293c3bf9276bea3fc4ab31b2e697dd1be0858ea (diff)
parentc0fb141fddbe1f514d97e0891f260f6b6f77fe63 (diff)
downloadotp-477f4a04e7d920982dd11d0fa6ee4fb7b7b5979f.tar.gz
otp-477f4a04e7d920982dd11d0fa6ee4fb7b7b5979f.tar.bz2
otp-477f4a04e7d920982dd11d0fa6ee4fb7b7b5979f.zip
Merge branch 'siri/appups-20.2' into maint
* siri/appups-20.2: Update kernel appup for OTP-20.2
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/kernel.appup.src6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index f1ef70a373..4ee497bbbd 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,7 +18,9 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.*, OTP-20.0
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
+ {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.1+
%% Down to - max one major revision back
- [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.*, OTP-20.0
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
+ {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.1+
}.