diff options
| author | Siri Hansen <[email protected]> | 2014-05-05 16:50:08 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-05-05 16:50:08 +0200 |
| commit | 97d6a97ad4cd6e81ed3182f07460c935899c4a54 (patch) | |
| tree | 99aec67a3fd165e7bcc2926b1a0925685cdf1ce0 | |
| parent | fe18de0c58e44e785a773ec6887a23fc384175b1 (diff) | |
| parent | a220bedd7d19b1918d83b55bb84f38db19689c4b (diff) | |
| download | otp-97d6a97ad4cd6e81ed3182f07460c935899c4a54.tar.gz otp-97d6a97ad4cd6e81ed3182f07460c935899c4a54.tar.bz2 otp-97d6a97ad4cd6e81ed3182f07460c935899c4a54.zip | |
Merge branch 'siri/appups-18.0/OTP-11881'
* siri/appups-18.0/OTP-11881:
Update kernel, stdlib and sasl appup files for Erlang/OTP-18
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 | ||||
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 6 | ||||
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index f8f4cc1ec2..1bae762bed 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -17,9 +17,7 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 + [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back - [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 + [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 }. diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index e789853eea..af04d007ac 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -17,9 +17,7 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}], %% R16 + [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back - [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 + [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 }. diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 22eefb2514..b584cbb47c 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -17,9 +17,7 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 + [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back - [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 - {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 + [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 }. |