aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-05-05 16:50:08 +0200
committerSiri Hansen <[email protected]>2014-05-05 16:50:08 +0200
commit97d6a97ad4cd6e81ed3182f07460c935899c4a54 (patch)
tree99aec67a3fd165e7bcc2926b1a0925685cdf1ce0 /lib/kernel
parentfe18de0c58e44e785a773ec6887a23fc384175b1 (diff)
parenta220bedd7d19b1918d83b55bb84f38db19689c4b (diff)
downloadotp-97d6a97ad4cd6e81ed3182f07460c935899c4a54.tar.gz
otp-97d6a97ad4cd6e81ed3182f07460c935899c4a54.tar.bz2
otp-97d6a97ad4cd6e81ed3182f07460c935899c4a54.zip
Merge branch 'siri/appups-18.0/OTP-11881'
* siri/appups-18.0/OTP-11881: Update kernel, stdlib and sasl appup files for Erlang/OTP-18
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/kernel.appup.src6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index f8f4cc1ec2..1bae762bed 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -17,9 +17,7 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
- {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
%% Down to - max one major revision back
- [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
- {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
}.