aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-10-01 10:16:32 +0200
committerSiri Hansen <[email protected]>2018-10-01 10:16:32 +0200
commitcf78a63a6e6ff96824ccede870612b286bbdacb7 (patch)
treebf4da433df49ae8190c6b1e670c42aa67128f219 /lib/stdlib/src
parentb0af859401fe5f7317a5ed474dfab2740a73b4c8 (diff)
parentf35dbcaeeec6ce828a9d770bfb90aaecd1c56864 (diff)
downloadotp-cf78a63a6e6ff96824ccede870612b286bbdacb7.tar.gz
otp-cf78a63a6e6ff96824ccede870612b286bbdacb7.tar.bz2
otp-cf78a63a6e6ff96824ccede870612b286bbdacb7.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/stdlib.appup.src6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 8d1cc09a8b..8c0b186288 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -19,8 +19,10 @@
{"%VSN%",
%% Up from - max one major revision back
[{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
- {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}],% OTP-21.*
+ {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-21.0
+ {<<"3\\.6(\\.[0-9]+)*">>,[restart_new_emulator]}],% OTP-21.1
%% Down to - max one major revision back
[{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
- {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.*
+ {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-21.0
+ {<<"3\\.6(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-21.1
}.