From 0f2ddb633ffe97a92584edfbaf95d2dce3961cc8 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Wed, 24 Apr 2019 14:29:10 +0200 Subject: Revert "Prepare release" This reverts commit 425889ba69b69a9b6fb14bfbef121d51b78e853a. --- lib/kernel/doc/src/notes.xml | 76 ----------------------------------------- lib/kernel/src/kernel.appup.src | 28 +++++++++++---- lib/kernel/vsn.mk | 2 +- 3 files changed, 22 insertions(+), 84 deletions(-) (limited to 'lib/kernel') diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 63d8f3565c..61bd598145 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -31,82 +31,6 @@

This document describes the changes made to the Kernel application.

-
Kernel 6.4 - -
Improvements and New Features - - -

- A simple socket API is provided through the socket - module. This is a low level API that does *not* replace - gen_[tcp|udp|sctp]. It is intended to *eventually* - replace the inet driver, but not the high level - gen-modules (gen_tcp, gen_udp and gen_sctp). It also - provides a basic API that facilitates the implementation - of other protocols, than TCP, UDP and SCTP.

-

- Known issues are; No support for the Windows OS - (currently).

-

- Own Id: OTP-14831

- - -

- Improved the documentation for the linger option.

-

- Own Id: OTP-15491 Aux Id: - https://github.com/erlang/otp/pull/2019

- - -

Global no longer tries more than once when connecting - to other nodes.

-

- Own Id: OTP-15607 Aux Id: ERIERL-280

- - -

- The dist messages EXIT, EXIT2 and MONITOR_DOWN have been - updated with new versions that send the reason term as - part of the payload of the message instead of as part of - the control message.

-

- The old versions are still present and can be used when - communicating with nodes that don't support the new - versions.

-

- Own Id: OTP-15611

- - -

- Kernel configuration parameter start_distribution = - boolean() is added. If set to false, the - system is started with all distribution functionality - disabled. Defaults to true.

-

- Own Id: OTP-15668 Aux Id: PR-2088

- - -

- In OTP-21.3, a warning was introduced for duplicated - applications/keys in configuration. This warning would be - displayed both when the configuration was given as a file - on system start, and during runtime via - application:set_env/1,2.

-

- The warning is now changed to a badarg exception - in application:set_env/1,2. If the faulty - configuration is given in a configuration file on system - start, the startup will fail.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-15692 Aux Id: PR-2170

- - -
- -
-
Kernel 6.3.1
Fixed Bugs and Malfunctions diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index cd0397a98c..aca3247c8f 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -19,15 +19,23 @@ %% %% We allow upgrade from, and downgrade to all previous %% versions from the following OTP releases: +%% - OTP 20 %% - OTP 21 -%% - OTP 22 %% %% We also allow upgrade from, and downgrade to all %% versions that have branched off from the above %% stated previous versions. %% {"%VSN%", - [{<<"^6\\.0$">>,[restart_new_emulator]}, + [{<<"^5\\.3$">>,[restart_new_emulator]}, + {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^5\\.4$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^6\\.0$">>,[restart_new_emulator]}, {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.1$">>,[restart_new_emulator]}, @@ -37,9 +45,16 @@ {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.3$">>,[restart_new_emulator]}, - {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], - [{<<"^6\\.0$">>,[restart_new_emulator]}, + {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}], + [{<<"^5\\.3$">>,[restart_new_emulator]}, + {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^5\\.4$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^6\\.0$">>,[restart_new_emulator]}, {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.1$">>,[restart_new_emulator]}, @@ -49,5 +64,4 @@ {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.3$">>,[restart_new_emulator]}, - {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. + {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}. diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index 765e890157..b1ae513223 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 6.4 +KERNEL_VSN = 6.3.1 -- cgit v1.2.3