diff options
author | Siri Hansen <[email protected]> | 2018-04-27 09:26:44 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2018-04-27 09:26:44 +0200 |
commit | 71de300439e43840f6456c3ad261f9853d923165 (patch) | |
tree | 4cc38bb6b2d0e5f332eacb11e10d8bdb5eaa2fc7 /lib/kernel/src | |
parent | d423a7af502227afcdcf7d2a1efecded85ea95fb (diff) | |
parent | c0e4e821312d792aef092803f0d8b70409a38263 (diff) | |
download | otp-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/kernel/src')
-rw-r--r-- | lib/kernel/src/kernel.appup.src | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 4ee497bbbd..305a1c788c 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -18,9 +18,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0 - {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.1+ + [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.0 + {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.1+ + {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-21 %% Down to - max one major revision back - [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0 - {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.1+ + [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.0 + {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.1+ + {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-21 }. |