diff options
| author | Siri Hansen <[email protected]> | 2016-11-11 15:15:20 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-11-11 15:15:20 +0100 |
| commit | cc45e36d1fb0b288ca534fa72fde772b62225e93 (patch) | |
| tree | 11e096d61e495b36cb5cdd4c5875af76c69527fc /lib/kernel | |
| parent | 699ee018507109534a42fa2c618b5a4945158aa2 (diff) | |
| parent | 98fa6e5ea2255194b32ced66b5f531bb4039fc4d (diff) | |
| download | otp-cc45e36d1fb0b288ca534fa72fde772b62225e93.tar.gz otp-cc45e36d1fb0b288ca534fa72fde772b62225e93.tar.bz2 otp-cc45e36d1fb0b288ca534fa72fde772b62225e93.zip | |
Merge branch 'siri/appups-20.0'
* siri/appups-20.0:
Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib
Update appups in kernel, stdlib and sasl for OTP-20
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 82cf73cbda..b505524471 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -18,9 +18,7 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* - {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-18.* + [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.* %% Down to - max one major revision back - [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* - {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-18.* + [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.* }. |