diff options
author | John Högberg <[email protected]> | 2017-10-25 08:58:33 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2017-10-25 08:58:33 +0200 |
commit | 40e787f289a240e6a6b12e03b9501dc492c89aa9 (patch) | |
tree | 1298495e187d9830935c85c8fae691d8f3ba8a27 /erts/vsn.mk | |
parent | 9bbe5884cf620aa1c70b92b6e0f3a9d5c3866a9c (diff) | |
parent | c26f0e58f440859abbfb9b4e3570713ac722e0da (diff) | |
download | otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.gz otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.bz2 otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that bind correct schedulers
Update version
Fix error handling when decoding an AVP with an alternate dictionary
Remove unused function arguments
Fix faulty recursion
vsn -> 2.1.2
Update appup for ERIERL-14684
Fix speling error 'sndbuf' -> 'recbuf'
Add zlib:set_controlling_process/2
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 3d7ff2db66..a788b2e491 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.1.2 +VSN = 9.1.3 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |