aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-05-25 14:38:46 +0200
committerRaimo Niskanen <[email protected]>2016-05-25 14:38:46 +0200
commitca9ecbb1fb04a80bd849d866b750090975f501f3 (patch)
tree72b1bd800215fcc479f9ae24dc484a0ef0fdee8e /erts/emulator
parent7a03eab1dd3ce2a1f9b4f7eae09d62f1ea48f401 (diff)
parent5d7dcfc2e0de7e93b29d01f07a2f970720d62f9d (diff)
downloadotp-ca9ecbb1fb04a80bd849d866b750090975f501f3.tar.gz
otp-ca9ecbb1fb04a80bd849d866b750090975f501f3.tar.bz2
otp-ca9ecbb1fb04a80bd849d866b750090975f501f3.zip
Merge branch 'dcsommer/kernel/inet-gethostbyname-res-option-inet6/PR-1065/OTP-13622'
* dcsommer/kernel/inet-gethostbyname-res-option-inet6/PR-1065/OTP-13622: Make inet:gethostbyname respect resolver option `inet6`
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions