diff options
| author | Zandra Hird <[email protected]> | 2015-06-10 17:56:54 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-06-10 17:58:38 +0200 |
| commit | 831aab8a46f9f659bc422fbbef4971e9e68b201f (patch) | |
| tree | 4318f347c500f20844057c83c78059d28f46c986 /erts/emulator/beam | |
| parent | fc73f98012ab8a1688f1bdc9063bfe9d63a675c9 (diff) | |
| parent | f50670cd0640088122a3c2b657645e82b03cd227 (diff) | |
| download | otp-831aab8a46f9f659bc422fbbef4971e9e68b201f.tar.gz otp-831aab8a46f9f659bc422fbbef4971e9e68b201f.tar.bz2 otp-831aab8a46f9f659bc422fbbef4971e9e68b201f.zip | |
Merge branch 'scrapinghub/proxy_addr_for_keeped_alive_request'
* scrapinghub/proxy_addr_for_keeped_alive_request:
inets: set proxy address for requests from keep-alive queue
OTP-12822
Diffstat (limited to 'erts/emulator/beam')
0 files changed, 0 insertions, 0 deletions