diff options
| author | Siri Hansen <[email protected]> | 2018-04-19 11:48:33 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2018-04-19 11:48:33 +0200 |
| commit | f15f615f9185077b02c011ac28257e8365c01e75 (patch) | |
| tree | af56cdd0efe9d46783d3d85b28af6c0a7c89a2b2 /lib/sasl/src/sasl.appup.src | |
| parent | 19256441771c191bcc971377e438cfa859246c55 (diff) | |
| parent | 6fad272f6b0a6b751386497191eb26e62e800ae2 (diff) | |
| download | otp-f15f615f9185077b02c011ac28257e8365c01e75.tar.gz otp-f15f615f9185077b02c011ac28257e8365c01e75.tar.bz2 otp-f15f615f9185077b02c011ac28257e8365c01e75.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
Update appup file for sasl
Fix bug in hybrid boot file used for restart_new_emulator
Diffstat (limited to 'lib/sasl/src/sasl.appup.src')
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index dcb568c413..0cef762bcf 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -20,9 +20,9 @@ %% Up from - max one major revision back [{<<"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* + {<<"3\\.1(\\.[0-2]+)*">>,[restart_new_emulator]}], % OTP-20.[1-3]* %% Down to - max one major revision back [{<<"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* + {<<"3\\.1(\\.[0-2]+)*">>,[restart_new_emulator]}] % OTP-20.[1-3]* }. |