diff options
author | Erlang/OTP <[email protected]> | 2014-07-22 18:01:19 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2014-07-22 18:01:19 +0200 |
commit | 52810718bcd607ebb538036bdbb87b5e94634984 (patch) | |
tree | b6cc19578e968c38a2510585e481b98c279bf7c4 /erts/vsn.mk | |
parent | 450f0f893b5d28e6d967b163111f8a8a6032b0e1 (diff) | |
parent | a60f3d879dfcdd018f1fea20790be901fbafeae4 (diff) | |
download | otp-52810718bcd607ebb538036bdbb87b5e94634984.tar.gz otp-52810718bcd607ebb538036bdbb87b5e94634984.tar.bz2 otp-52810718bcd607ebb538036bdbb87b5e94634984.zip |
Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16
* lukas/kernel/bind_with_fdopen/OTP-12061:
Fix default behaviour for legacy fdopen
erts: Fix inet close on prebound fds
kernel: When doing an fdopen we now also bind the fd to the specified addr/port
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 0355901877..af74fb96c9 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,7 +17,7 @@ # %CopyrightEnd% # -VSN = 5.10.4 +VSN = 5.10.4.1 SYSTEM_VSN = R16B03-1 # Port number 4365 in 4.2 |