aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/ebin
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-07-31 16:19:42 +0200
committerRaimo Niskanen <[email protected]>2019-07-31 16:39:28 +0200
commit1a8f8b199589b5a16b22489e6501f13fbc2e1b54 (patch)
treee8332f3c86a546f23d3b398e3eba9ba502e59a0c /erts/preloaded/ebin
parent6c4ad85880375b242ac48a2bf439887f503ce203 (diff)
parent387974e678423b403439c90a0a4026f258be891f (diff)
downloadotp-1a8f8b199589b5a16b22489e6501f13fbc2e1b54.tar.gz
otp-1a8f8b199589b5a16b22489e6501f13fbc2e1b54.tar.bz2
otp-1a8f8b199589b5a16b22489e6501f13fbc2e1b54.zip
Merge branch 'raimo/inherit-listen-options/OTP-15824' into maint
* raimo/inherit-listen-options/OTP-15824: The linger option is not transferred on *BSD
Diffstat (limited to 'erts/preloaded/ebin')
-rw-r--r--erts/preloaded/ebin/prim_inet.beambin81424 -> 81508 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index f67b660a08..f77e9e863d 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
Binary files differ