diff options
| author | Erlang/OTP <[email protected]> | 2014-07-10 10:45:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-07-10 10:45:13 +0200 |
| commit | b376a4b8dd21a943be3226bb696a1622537edf86 (patch) | |
| tree | 04546a16fe10c520c21aecd95caaa890723f75d8 /lib/stdlib/src/stdlib.appup.src | |
| parent | a7176f9186ffd7eb2b26daca2264d425383cf6a7 (diff) | |
| parent | ab5afc3d8cbd0211fef7c9c71edc2708f643f705 (diff) | |
| download | otp-b376a4b8dd21a943be3226bb696a1622537edf86.tar.gz otp-b376a4b8dd21a943be3226bb696a1622537edf86.tar.bz2 otp-b376a4b8dd21a943be3226bb696a1622537edf86.zip | |
Merge branch 'nox/filelib-wildcard-broken-link' into maint-17
* nox/filelib-wildcard-broken-link:
Update stdlib appup file
Update runtime dependencies
Update preloaded
Add tests of filelib and symlinks
Fix handling of broken symlinks in filelib
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to 'lib/stdlib/src/stdlib.appup.src')
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 22eefb2514..99d9b8b431 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -17,9 +17,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1 + {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.0 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 %% Down to - max one major revision back - [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1 + {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.0 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 }. |