diff options
| author | Rickard Green <[email protected]> | 2019-02-27 13:19:37 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-02-27 13:19:37 +0100 |
| commit | 196b7abdb0aad42c3b7e10e9aedb9fb720525676 (patch) | |
| tree | 0be24d33f34d249ac404c28d316cdbb2c3680312 /lib/kernel | |
| parent | 91637325d535b0881f6cc279927785d8ae0350e2 (diff) | |
| download | otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.tar.gz otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.tar.bz2 otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.zip | |
Revert "Prepare release"
This reverts commit df130102cdeca8d35fec95a0c926fd1cfec54eab.
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/notes.xml | 37 | ||||
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 30 | ||||
| -rw-r--r-- | lib/kernel/vsn.mk | 2 |
3 files changed, 22 insertions, 47 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 524891afb8..021ecfa40d 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -31,43 +31,6 @@ </header> <p>This document describes the changes made to the Kernel application.</p> -<section><title>Kernel 6.3</title> - - <section><title>Improvements and New Features</title> - <list> - <item> - <p> - A simple socket API has been provided through the socket - module. Known issues are; No support for the Windows OS - (currently), a small term leakage.</p> - <p> - Own Id: OTP-14831</p> - </item> - <item> - <p> - Improved the documentation for the linger option.</p> - <p> - Own Id: OTP-15491 Aux Id: - https://github.com/erlang/otp/pull/2019 </p> - </item> - <item> - <p> - 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.</p> - <p> - The old versions are still present and can be used when - communicating with nodes that don't support the new - versions.</p> - <p> - Own Id: OTP-15611</p> - </item> - </list> - </section> - -</section> - <section><title>Kernel 6.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 7c125b5816..ccf0a82ced 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -19,27 +19,39 @@ %% %% 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]}, {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^6\\.2$">>,[restart_new_emulator]}, - {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}], - [{<<"^6\\.0$">>,[restart_new_emulator]}, + {<<"^6\\.1\\.1(?:\\.[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]}, {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, - {<<"^6\\.2$">>,[restart_new_emulator]}, - {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}. + {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index 7bebe1ba70..4b43c6ae9d 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1 +1 @@ -KERNEL_VSN = 6.3 +KERNEL_VSN = 6.2 |