diff options
| author | Raimo Niskanen <[email protected]> | 2010-09-02 11:36:37 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-09-02 11:36:37 +0200 |
| commit | 9ea58dff408c0c72f5a6ad0e11b521a80292b024 (patch) | |
| tree | baa9d1b156746ad1d1e0312ffb989218c54fd3d2 /erts/preloaded/ebin | |
| parent | 9a30a97f07a68fc5a2f1c0095bdd88818e94089a (diff) | |
| parent | 8a0e1429ef2099378cdab0288224207d4d64332d (diff) | |
| download | otp-9ea58dff408c0c72f5a6ad0e11b521a80292b024.tar.gz otp-9ea58dff408c0c72f5a6ad0e11b521a80292b024.tar.bz2 otp-9ea58dff408c0c72f5a6ad0e11b521a80292b024.zip | |
Merge branch 'rani/sctp-sndrcvinfo/OTP-8795' into dev
* rani/sctp-sndrcvinfo/OTP-8795:
Fix xfer_active close expection for Solaris behaviour
Keep default #sctp_sndrcvinfo{} fields on gen_sctp:send/4
Fill in sinfo_assoc_id in struct sctp_sndrcvinfo for getopt()
Conflicts:
lib/kernel/test/gen_sctp_SUITE.erl
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 57272 -> 57280 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex ac336c1b2d..71f6643368 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam |