aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-04-27 09:26:44 +0200
committerSiri Hansen <[email protected]>2018-04-27 09:26:44 +0200
commit71de300439e43840f6456c3ad261f9853d923165 (patch)
tree4cc38bb6b2d0e5f332eacb11e10d8bdb5eaa2fc7 /lib/stdlib/src
parentd423a7af502227afcdcf7d2a1efecded85ea95fb (diff)
parentc0e4e821312d792aef092803f0d8b70409a38263 (diff)
downloadotp-71de300439e43840f6456c3ad261f9853d923165.tar.gz
otp-71de300439e43840f6456c3ad261f9853d923165.tar.bz2
otp-71de300439e43840f6456c3ad261f9853d923165.zip
Merge branch 'siri/appups-21'
* siri/appups-21: Update appups in kernel, stdlib and sasl for OTP-21.0
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 e4e3fb83e9..8d1cc09a8b 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -18,7 +18,9 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.*
+ [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
+ {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}],% OTP-21.*
%% Down to - max one major revision back
- [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.*
+ [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
+ {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.*
}.