aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/kernel.appup.src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-09-21 09:49:56 +0200
committerHans Bolinder <[email protected]>2015-09-21 09:49:56 +0200
commit41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8 (patch)
treee8835c5b05ff9a1989d08715bfb8c3ff8e48a16f /lib/kernel/src/kernel.appup.src
parent8a84e8ec16df01fcd37e61f2cf22c4b17178507a (diff)
parent1d3e719905f29dfa6a87b0f65aa0120b3e6cfe2f (diff)
downloadotp-41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8.tar.gz
otp-41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8.tar.bz2
otp-41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8.zip
Merge branch 'hb/app_vsn' into maint
* hb/app_vsn: Update application versions
Diffstat (limited to 'lib/kernel/src/kernel.appup.src')
-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 701aafc717..3fda55d1a9 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
- [{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
+ [{<<"4\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.*
+ {<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
%% Down to - max one major revision back
- [{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
+ [{<<"4\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.*
+ {<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
}.