aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-15 16:39:42 +0200
committerIngela Anderton Andin <[email protected]>2015-09-15 16:39:42 +0200
commite802c5d8152440cc59003f04271f7f1934453db4 (patch)
treeb20ade33c7be23c4bc4c034c5ed122f491a9f74b /erts
parent0d2bebf94d99b2d3bd39c5731ac81122f3ea7fb7 (diff)
parenta66d9fb8813d32c7ded2253a7a5904f5b20b5ba8 (diff)
downloadotp-e802c5d8152440cc59003f04271f7f1934453db4.tar.gz
otp-e802c5d8152440cc59003f04271f7f1934453db4.tar.bz2
otp-e802c5d8152440cc59003f04271f7f1934453db4.zip
Merge branch 'ia/pr/800/OTP-12984' into maint
* ia/pr/800/OTP-12984: inets: Forward connection errors with https proxy
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions