diff options
| author | Raimo Niskanen <[email protected]> | 2016-06-02 07:52:28 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-06-02 08:00:57 +0200 |
| commit | 30a202a41eb51f74d44e25667780136507395713 (patch) | |
| tree | bf322dbdd67a56b2d521e8c8f37f00197ffae3a4 /lib/kernel/test/appinc1x.erl | |
| parent | faa62026143e37f80dbbb5f895715d1b8a369a9a (diff) | |
| parent | 0f1a85ef0373f2b5767579a30a6dc29eeb16438a (diff) | |
| download | otp-30a202a41eb51f74d44e25667780136507395713.tar.gz otp-30a202a41eb51f74d44e25667780136507395713.tar.bz2 otp-30a202a41eb51f74d44e25667780136507395713.zip | |
Merge branch 'saleyn/uds/PR-612/OTP-13572'
* saleyn/uds/PR-612/OTP-13572:
Rewrite inet* for address family 'local'
Rewrite inet_drv for AF_LOCAL
Assign externally open fd to gen_tcp (UDS support)
Conflicts:
erts/preloaded/ebin/prim_inet.beam
lib/kernel/doc/src/gen_tcp.xml
lib/kernel/doc/src/gen_udp.xml
lib/kernel/src/inet6_sctp.erl
lib/kernel/test/inet_SUITE.erl
Diffstat (limited to 'lib/kernel/test/appinc1x.erl')
0 files changed, 0 insertions, 0 deletions