diff options
author | Björn Gustavsson <[email protected]> | 2014-09-01 13:13:06 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2014-09-01 13:13:11 +0200 |
commit | 2eb59a61713bbceae3bd8d05ea11b394c5671f3f (patch) | |
tree | 1e65046b5b76aa79c647e47ba40fa3d4a3a92013 /bootstrap/lib/kernel | |
parent | 71194f856f0842a70fd22f3771fb88f7d3c8f0c9 (diff) | |
parent | a86003309753591911b68e8bc11ae94d631abb24 (diff) | |
download | otp-2eb59a61713bbceae3bd8d05ea11b394c5671f3f.tar.gz otp-2eb59a61713bbceae3bd8d05ea11b394c5671f3f.tar.bz2 otp-2eb59a61713bbceae3bd8d05ea11b394c5671f3f.zip |
Update primary bootstrap
Diffstat (limited to 'bootstrap/lib/kernel')
-rw-r--r-- | bootstrap/lib/kernel/ebin/code_server.beam | bin | 28532 -> 28572 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/erl_boot_server.beam | bin | 5924 -> 6016 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/erl_epmd.beam | bin | 7128 -> 7096 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/erts_debug.beam | bin | 4048 -> 4312 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/file.beam | bin | 14528 -> 14500 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/hipe_unified_loader.beam | bin | 13516 -> 13508 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/inet.beam | bin | 23464 -> 23716 bytes | |||
-rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.app | 4 | ||||
-rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.appup | 8 | ||||
-rw-r--r-- | bootstrap/lib/kernel/ebin/net_adm.beam | bin | 3088 -> 3016 bytes |
10 files changed, 5 insertions, 7 deletions
diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam Binary files differindex 430c2e0733..340c5feed9 100644 --- a/bootstrap/lib/kernel/ebin/code_server.beam +++ b/bootstrap/lib/kernel/ebin/code_server.beam diff --git a/bootstrap/lib/kernel/ebin/erl_boot_server.beam b/bootstrap/lib/kernel/ebin/erl_boot_server.beam Binary files differindex 7e43b0fb36..6e56a1061d 100644 --- a/bootstrap/lib/kernel/ebin/erl_boot_server.beam +++ b/bootstrap/lib/kernel/ebin/erl_boot_server.beam diff --git a/bootstrap/lib/kernel/ebin/erl_epmd.beam b/bootstrap/lib/kernel/ebin/erl_epmd.beam Binary files differindex 1a74da7f1f..bf171450e9 100644 --- a/bootstrap/lib/kernel/ebin/erl_epmd.beam +++ b/bootstrap/lib/kernel/ebin/erl_epmd.beam diff --git a/bootstrap/lib/kernel/ebin/erts_debug.beam b/bootstrap/lib/kernel/ebin/erts_debug.beam Binary files differindex 7d059d10cf..17320342bc 100644 --- a/bootstrap/lib/kernel/ebin/erts_debug.beam +++ b/bootstrap/lib/kernel/ebin/erts_debug.beam diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam Binary files differindex 4444b79bf7..25f2506078 100644 --- a/bootstrap/lib/kernel/ebin/file.beam +++ b/bootstrap/lib/kernel/ebin/file.beam diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam Binary files differindex 46263fae7b..b24c850af3 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.beam b/bootstrap/lib/kernel/ebin/inet.beam Binary files differindex fe203f816f..4d156b726c 100644 --- a/bootstrap/lib/kernel/ebin/inet.beam +++ b/bootstrap/lib/kernel/ebin/inet.beam diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 1fd4edd044..e60b36e1e7 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -21,7 +21,7 @@ {application, kernel, [ {description, "ERTS CXC 138 10"}, - {vsn, "3.0"}, + {vsn, "3.0.2"}, {modules, [application, application_controller, application_master, @@ -115,6 +115,6 @@ {applications, []}, {env, [{error_logger, tty}]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-6.0", "stdlib-2.0", "sasl-2.4"]} + {runtime_dependencies, ["erts-6.1.2", "stdlib-2.0", "sasl-2.4"]} ] }. diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup index fda418ae8a..7640fd5987 100644 --- a/bootstrap/lib/kernel/ebin/kernel.appup +++ b/bootstrap/lib/kernel/ebin/kernel.appup @@ -15,11 +15,9 @@ %% under the License. %% %% %CopyrightEnd% -{"3.0", +{"3.0.2", %% 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 }. diff --git a/bootstrap/lib/kernel/ebin/net_adm.beam b/bootstrap/lib/kernel/ebin/net_adm.beam Binary files differindex fb722b3b4e..4b09aae8a5 100644 --- a/bootstrap/lib/kernel/ebin/net_adm.beam +++ b/bootstrap/lib/kernel/ebin/net_adm.beam |