diff options
| author | Siri Hansen <siri@erlang.org> | 2017-09-19 16:18:14 +0200 |
|---|---|---|
| committer | Siri Hansen <siri@erlang.org> | 2017-09-19 16:18:14 +0200 |
| commit | 84c1db49f0dabac3f000b2bf25af1dc483cfed05 (patch) | |
| tree | 2a6560a6bd1380ecb07bfdc168bc01c09b49845f | |
| parent | e01a81ba3119247b8837f6202591c2a3fec264e9 (diff) | |
| parent | 69b9017a1367953f63869efd29658c193c7d7365 (diff) | |
| download | erlang-84c1db49f0dabac3f000b2bf25af1dc483cfed05.tar.gz | |
Merge branch 'siri/appups-20.1' into maint
* siri/appups-20.1:
Update appup in stdlib and sasl for OTP-20.1
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 8 | ||||
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index 7f866507a0..dcb568c413 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -18,7 +18,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.* + [{<<"3\\.0((\\.[0-3])(\\.[0-9]+)*)?">>,[restart_new_emulator]}, % OTP-19.* + {<<"3\\.0\\.[4-9](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.0* + {<<"3\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.1* %% Down to - max one major revision back - [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.* + [{<<"3\\.0((\\.[0-3])(\\.[0-9]+)*)?">>,[restart_new_emulator]}, % OTP-19.* + {<<"3\\.0\\.[4-9](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.0* + {<<"3\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.1* }. diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 3100504a80..800c2c61f3 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -18,7 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.* + [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + {<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.* %% Down to - max one major revision back - [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.* + [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + {<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-20.* }. |