diff options
| author | Henrik Nord <henrik@erlang.org> | 2021-02-24 09:54:27 +0100 |
|---|---|---|
| committer | Henrik Nord <henrik@erlang.org> | 2021-02-24 09:54:27 +0100 |
| commit | 017a28c22dedafa51988bd431c8dd554c6d85184 (patch) | |
| tree | 93ac31f03700315d15a2a13bd2d39affe8ca95e0 /lib/stdlib/src | |
| parent | 946e2b69e40f7c7595e2bb49738fb9639161c315 (diff) | |
| download | erlang-017a28c22dedafa51988bd431c8dd554c6d85184.tar.gz | |
Revert "Prepare release"
This reverts commit bbc0f3386c2546af25936730742d8dee1664f1dd.
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/stdlib.app.src | 2 | ||||
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 30 |
2 files changed, 26 insertions, 6 deletions
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src index f03aab50b6..a906349463 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-12.0","crypto-3.3", + {runtime_dependencies, ["sasl-3.0","kernel-7.0","erts-@OTP-16718@","crypto-3.3", "compiler-5.0"]} ]}. diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index b4ee77a84b..2f44c251e0 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 @@ -41,8 +41,18 @@ {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^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\\.9$">>,[restart_new_emulator]}, {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -60,8 +70,18 @@ {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^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\\.9$">>,[restart_new_emulator]}, {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, |