diff options
| author | Erlang/OTP <[email protected]> | 2015-12-03 11:11:00 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-12-03 11:11:00 +0100 |
| commit | df7c7b59c9f1b796e72d1d27a35a61f1392d7f23 (patch) | |
| tree | 5acb1151ef55f60f4759b313c83bc3a097c2cb37 /lib/kernel/src/kernel.appup.src | |
| parent | bd1251dfe4d60f09e569731d36a92e94acbe297a (diff) | |
| parent | 54204bb039a780e7b8d9295303bf7a4f41744641 (diff) | |
| download | otp-df7c7b59c9f1b796e72d1d27a35a61f1392d7f23.tar.gz otp-df7c7b59c9f1b796e72d1d27a35a61f1392d7f23.tar.bz2 otp-df7c7b59c9f1b796e72d1d27a35a61f1392d7f23.zip | |
Merge branch 'raimo/inet-setopts-multi-raw/OTP-11482' into maint-17
* raimo/inet-setopts-multi-raw/OTP-11482:
Update appup
Testcase for inet:setopts/2 multiple raw options
Fix inet:setopts/2 to take multiple raw options
Fix error propagate from setopts
Diffstat (limited to 'lib/kernel/src/kernel.appup.src')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index f8f4cc1ec2..652f39c092 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-2014. All Rights Reserved. +%% Copyright Ericsson AB 1999-2015. 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 @@ -17,9 +17,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"3\\.[0-9]+(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 %% Down to - max one major revision back - [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"3\\.[0-9]+(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 }. |