diff options
| author | Raimo Niskanen <[email protected]> | 2013-09-04 14:58:35 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2013-09-04 14:58:35 +0200 |
| commit | 13713794c52e0273dd312823af7a0427d9295574 (patch) | |
| tree | 4a55995dbeb41bee9d3783b76243449fabeecc49 /erts/preloaded/ebin | |
| parent | 11c31f5ba8489b0e179caea46e514b990fbadb95 (diff) | |
| parent | af112cb10613d422080785621a274a18d96567c0 (diff) | |
| download | otp-13713794c52e0273dd312823af7a0427d9295574.tar.gz otp-13713794c52e0273dd312823af7a0427d9295574.tar.bz2 otp-13713794c52e0273dd312823af7a0427d9295574.zip | |
Merge branch 'raimo/linux-network-namespace-sockopt/OTP-11157' into maint
* raimo/linux-network-namespace-sockopt/OTP-11157:
Document socket option 'netns'
Rudimentary test
Make netns option value a string
Implement netns for SCTP + bugfixes
Implement netns option for TCP and UDP
Implement emulator netns support for TCP and UDP
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 70520 -> 70960 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 8638ef677e..5b38871282 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam |