diff options
| author | Björn Gustavsson <[email protected]> | 2015-09-21 10:25:58 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-09-21 10:26:19 +0200 |
| commit | 576b2e9cbb4dab925b3943d2b82b43a3b4d79487 (patch) | |
| tree | e1b3b7e8c1ad7826751f352cddffb33672a0374f /bootstrap/lib/kernel | |
| parent | a329b16a074e5aaaa0b640b2ad83e533a5cc0fdc (diff) | |
| download | otp-576b2e9cbb4dab925b3943d2b82b43a3b4d79487.tar.gz otp-576b2e9cbb4dab925b3943d2b82b43a3b4d79487.tar.bz2 otp-576b2e9cbb4dab925b3943d2b82b43a3b4d79487.zip | |
Update primary bootstrap
Diffstat (limited to 'bootstrap/lib/kernel')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/hipe_unified_loader.beam | bin | 13712 -> 13712 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/inet_dns.beam | bin | 19664 -> 19672 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.app | 6 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.appup | 8 |
4 files changed, 8 insertions, 6 deletions
diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam Binary files differindex a2987da34b..e60cf784ea 100644 --- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam +++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam diff --git a/bootstrap/lib/kernel/ebin/inet_dns.beam b/bootstrap/lib/kernel/ebin/inet_dns.beam Binary files differindex 9404760336..415c436dc2 100644 --- a/bootstrap/lib/kernel/ebin/inet_dns.beam +++ b/bootstrap/lib/kernel/ebin/inet_dns.beam diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 85ba41bcef..644077b9e7 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2015. 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. @@ -22,7 +22,7 @@ {application, kernel, [ {description, "ERTS CXC 138 10"}, - {vsn, "4.0"}, + {vsn, "4.1"}, {modules, [application, application_controller, application_master, @@ -116,6 +116,6 @@ {applications, []}, {env, [{error_logger, tty}]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-7.0", "stdlib-2.5", "sasl-2.4"]} + {runtime_dependencies, ["erts-7.0", "stdlib-2.6", "sasl-2.6"]} ] }. diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup index d09e0c6347..b2a161aa1d 100644 --- a/bootstrap/lib/kernel/ebin/kernel.appup +++ b/bootstrap/lib/kernel/ebin/kernel.appup @@ -16,9 +16,11 @@ %% limitations under the License. %% %% %CopyrightEnd% -{"4.0", +{"4.1", %% 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 }. |