diff options
| author | Rickard Green <[email protected]> | 2014-02-26 15:36:17 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-26 15:36:17 +0100 |
| commit | 7d4bb870a8400599166407202d584ad4ea2b741d (patch) | |
| tree | 2ad8bc8992ff6cd826fc07ee354b9f94ac65253b /bootstrap/lib/kernel | |
| parent | 2202a8880f5472ce4bf65afdb967c70a12f35703 (diff) | |
| download | otp-7d4bb870a8400599166407202d584ad4ea2b741d.tar.gz otp-7d4bb870a8400599166407202d584ad4ea2b741d.tar.bz2 otp-7d4bb870a8400599166407202d584ad4ea2b741d.zip | |
Update preloaded and primary bootstrap
Diffstat (limited to 'bootstrap/lib/kernel')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/application_master.beam | bin | 6340 -> 6744 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.appup | 12 |
2 files changed, 5 insertions, 7 deletions
diff --git a/bootstrap/lib/kernel/ebin/application_master.beam b/bootstrap/lib/kernel/ebin/application_master.beam Binary files differindex 14329fa051..365bc7b53d 100644 --- a/bootstrap/lib/kernel/ebin/application_master.beam +++ b/bootstrap/lib/kernel/ebin/application_master.beam diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup index b58d066898..fda418ae8a 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-2013. All Rights Reserved. +%% Copyright Ericsson AB 1999-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -16,12 +16,10 @@ %% %% %CopyrightEnd% {"3.0", - %% Up from - max two major revisions back + %% Up from - max one major revision back [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 - {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15 - %% Down to - max two major revisions back + {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 + %% Down to - max one major revision back [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 - {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 + {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 }. |