diff options
author | Siri Hansen <[email protected]> | 2018-10-01 10:13:55 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2018-10-01 10:13:55 +0200 |
commit | f35dbcaeeec6ce828a9d770bfb90aaecd1c56864 (patch) | |
tree | 03ba770138b97d3dde0c766bb3abc6703fb83461 /lib/kernel/src/kernel.appup.src | |
parent | 377f19f25aeec6939a6728bd0c4910086c22ccdc (diff) | |
parent | 26507e04fdc5c9910a24ddc44010c45d2d0027da (diff) | |
download | otp-f35dbcaeeec6ce828a9d770bfb90aaecd1c56864.tar.gz otp-f35dbcaeeec6ce828a9d770bfb90aaecd1c56864.tar.bz2 otp-f35dbcaeeec6ce828a9d770bfb90aaecd1c56864.zip |
Merge branch 'siri/appups-21.2' into maint
* siri/appups-21.2:
Update kernel, stdlib and sasl appups for OTP-21.2
Diffstat (limited to 'lib/kernel/src/kernel.appup.src')
-rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 305a1c788c..0c0435e051 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -20,9 +20,11 @@ %% Up from - max one major revision back [{<<"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 + {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-21.0 + {<<"6\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-21.1 %% Down to - max one major revision back [{<<"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 + {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-21.0 + {<<"6\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-21.1 }. |