diff options
| author | Siri Hansen <[email protected]> | 2014-02-20 15:59:26 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-02-20 15:59:26 +0100 |
| commit | 8fcf49c05ca364fb2167940118e21fe54d395d52 (patch) | |
| tree | e493c73bd41e6a3ca45c6dd8b6e7c773e99688f8 /lib/kernel/src | |
| parent | 4ba99d6cf384fa9aeb74981312716b275a53fca1 (diff) | |
| parent | 69bb84dfd1ac198f1ddc6998ce039e8e88ffdd18 (diff) | |
| download | otp-8fcf49c05ca364fb2167940118e21fe54d395d52.tar.gz otp-8fcf49c05ca364fb2167940118e21fe54d395d52.tar.bz2 otp-8fcf49c05ca364fb2167940118e21fe54d395d52.zip | |
Merge branch 'siri/appup_tests_17/OTP-11534'
* siri/appup_tests_17/OTP-11534:
Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib
Update appups and appup tests for kernel, stdlib and sasl
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index b946c2d1af..f8f4cc1ec2 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -1,7 +1,7 @@ %% -*- erlang -*- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2013. All Rights Reserved. +%% Copyright Ericsson AB 1999-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -16,12 +16,10 @@ %% %% %CopyrightEnd% {"%VSN%", - %% Up from - max two major revisions back + %% Up from - max one major revision back [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 - {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15 - %% Down to - max two major revisions back + {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 + %% Down to - max one major revision back [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 - {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 + {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 }. |