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 /erts/vsn.mk | |
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 'erts/vsn.mk')
-rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index c4bef03e94..59699c6505 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.0.1 +VSN = 9.0.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |