diff options
| author | John Högberg <[email protected]> | 2017-07-27 09:10:16 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-27 09:10:16 +0200 |
| commit | 2f49a6bdc5bc9207162bff837b3f642cdd089722 (patch) | |
| tree | bc069deded7bf5130543a3be2dd66ad89abf7772 /lib/kernel/src/kernel.appup.src | |
| parent | 0b4e79dc173d562d05d93867d5cc9f1711ad0582 (diff) | |
| parent | 6ede2da826335960037299d9f3b0e66d072ea5a0 (diff) | |
| download | otp-2f49a6bdc5bc9207162bff837b3f642cdd089722.tar.gz otp-2f49a6bdc5bc9207162bff837b3f642cdd089722.tar.bz2 otp-2f49a6bdc5bc9207162bff837b3f642cdd089722.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
Fix doc for the 'quiet' option; it defaults to false
asn1: Fix missing quotes of external encoding call
Add a dedicated close function for TCP ports to prevent issues like ERL-430/448
Close TCP ports properly on send timeout
erts: Add missing release note
Diffstat (limited to 'lib/kernel/src/kernel.appup.src')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 77085b2064..f1ef70a373 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -18,7 +18,7 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.* + [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.*, OTP-20.0 %% Down to - max one major revision back - [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.* + [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.*, OTP-20.0 }. |