diff options
| author | Hans Bolinder <[email protected]> | 2015-09-21 09:53:12 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-09-21 09:53:12 +0200 |
| commit | cc4d2fda78255b183014490fa108e30ff7d65e71 (patch) | |
| tree | 5bedd1c4a735ef79656a5484ae3be2456c0c23d2 /lib/kernel | |
| parent | 986683dcfff264e55e854c9566281b0f4c0e2d43 (diff) | |
| parent | 41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8 (diff) | |
| download | otp-cc4d2fda78255b183014490fa108e30ff7d65e71.tar.gz otp-cc4d2fda78255b183014490fa108e30ff7d65e71.tar.bz2 otp-cc4d2fda78255b183014490fa108e30ff7d65e71.zip | |
Merge branch 'maint'
* maint:
Update application versions
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/src/kernel.app.src | 4 | ||||
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 | ||||
| -rw-r--r-- | lib/kernel/vsn.mk | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src index c9327e4f31..b5555ca1a5 100644 --- a/lib/kernel/src/kernel.app.src +++ b/lib/kernel/src/kernel.app.src @@ -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. @@ -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/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 701aafc717..3fda55d1a9 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -18,7 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% 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 }. diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index c912da0091..d549033302 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 4.0 +KERNEL_VSN = 4.1 |