aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/lib/kernel/ebin/kernel.appup
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-06-14 16:01:54 +0200
committerRickard Green <[email protected]>2017-06-14 16:01:54 +0200
commit48e67f5dd1d20b9a1f78c5a97cc7ed4afb489ba5 (patch)
treeb48261ecb0de7a1da84bd693062d420fa50a2b52 /bootstrap/lib/kernel/ebin/kernel.appup
parent8e1cd77c97835c7ac8ecc1adcc13a366fb3904a3 (diff)
parent03bedf49b6ad81ee6a78ec40137c782989fe98bf (diff)
downloadotp-48e67f5dd1d20b9a1f78c5a97cc7ed4afb489ba5.tar.gz
otp-48e67f5dd1d20b9a1f78c5a97cc7ed4afb489ba5.tar.bz2
otp-48e67f5dd1d20b9a1f78c5a97cc7ed4afb489ba5.zip
Merge branch 'rickard/t2b-latin1-atom'
OTP-14337 * rickard/t2b-latin1-atom: Update primary bootstrap Update preloaded modules Fix erl_interface tests Introduce minor vsn 2 in term_to_binary/2 Revert "kernel: Try mend disk_log whitebox tests" Revert "erts: Do not generate atoms on old latin1 external format"
Diffstat (limited to 'bootstrap/lib/kernel/ebin/kernel.appup')
-rw-r--r--bootstrap/lib/kernel/ebin/kernel.appup8
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup
index 96e279c584..346be4db7c 100644
--- a/bootstrap/lib/kernel/ebin/kernel.appup
+++ b/bootstrap/lib/kernel/ebin/kernel.appup
@@ -1,7 +1,7 @@
%% -*- erlang -*-
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
%% limitations under the License.
%%
%% %CopyrightEnd%
-{"5.1.1",
+{"5.2",
%% Up from - max one major revision back
- [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.*
+ [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.*
%% Down to - max one major revision back
- [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.*
+ [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.*
}.