summaryrefslogtreecommitdiff
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2021-03-25 16:27:17 +0100
committerErlang/OTP <otp@erlang.org>2021-03-25 16:27:17 +0100
commit1cc1d15c4e54c1d9d8c34a4c66193a95b10c479a (patch)
tree0272fb5bf328310831d06510a03864de5942ee8d /lib/stdlib/src
parent444144870c528d80a3fcf34b3a2d1707115987f2 (diff)
downloaderlang-1cc1d15c4e54c1d9d8c34a4c66193a95b10c479a.tar.gz
Prepare release
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/stdlib.app.src2
-rw-r--r--lib/stdlib/src/stdlib.appup.src28
2 files changed, 4 insertions, 26 deletions
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index a906349463..f03aab50b6 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -111,6 +111,6 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-3.0","kernel-7.0","erts-@OTP-16718@","crypto-3.3",
+ {runtime_dependencies, ["sasl-3.0","kernel-7.0","erts-12.0","crypto-3.3",
"compiler-5.0"]}
]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index bba0d1ceee..64bce598d1 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -19,9 +19,9 @@
%%
%% We allow upgrade from, and downgrade to all previous
%% versions from the following OTP releases:
-%% - OTP 21
%% - OTP 22
%% - OTP 23
+%% - OTP 24
%%
%% We also allow upgrade from, and downgrade to all
%% versions that have branched off from the above
@@ -43,18 +43,7 @@
{<<"^3\\.13\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.14$">>,[restart_new_emulator]},
{<<"^3\\.14\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.5$">>,[restart_new_emulator]},
- {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.6$">>,[restart_new_emulator]},
- {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.7$">>,[restart_new_emulator]},
- {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.8$">>,[restart_new_emulator]},
- {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.8\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.8\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.9$">>,[restart_new_emulator]},
{<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -74,18 +63,7 @@
{<<"^3\\.13\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.14$">>,[restart_new_emulator]},
{<<"^3\\.14\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.5$">>,[restart_new_emulator]},
- {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.6$">>,[restart_new_emulator]},
- {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.7$">>,[restart_new_emulator]},
- {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.8$">>,[restart_new_emulator]},
- {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^3\\.8\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^3\\.8\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.9$">>,[restart_new_emulator]},
{<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},