summaryrefslogtreecommitdiff
path: root/erts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'raimo/tcp-close-while-send/maint/ERL-561/OTP-12242' into maintRaimo Niskanen2018-10-222-27/+116
|\
| * Fix hanging gen_tcp send vs close raceRaimo Niskanen2018-10-192-27/+116
* | Merge branch 'maint-20' into maintHans Nilsson2018-10-181-1/+18
|\ \
| * | Prepare releaseErlang/OTP2018-10-162-1/+19
| * | Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maint-20Erlang/OTP2018-10-161-10/+2
| |\ \
* | \ \ Merge branch 'sverker/erts/debug_free_null' into maintSverker Eriksson2018-10-171-0/+3
|\ \ \ \
| * | | | erts: Fix bug in debug_free for NULL pointerSverker Eriksson2018-10-151-0/+3
* | | | | Merge branch 'igor/tcp-nopush-ERL-698/OTP-15357' into maintJohn Högberg2018-10-173-1/+56
|\ \ \ \ \
| * | | | | "cork" tcp socket around file:sendfileIgor Slepchin2018-10-111-1/+23
| * | | | | Add nopush TCP socket optionIgor Slepchin2018-10-112-0/+33
* | | | | | Merge branch 'maint-21' into maintRickard Green2018-10-125-59/+138
|\ \ \ \ \ \
| * | | | | | Prepare releaseErlang/OTP2018-10-122-1/+29
| * | | | | | Merge branch 'john/erts/fix-unc-paths-windows/OTP-15333/ERL-737' into maint-21Erlang/OTP2018-10-121-54/+103
| |\ \ \ \ \ \
| | * | | | | | erts: Fix UNC path handling on WindowsJohn Högberg2018-10-111-53/+102
| | * | | | | | erts: Fix a compiler warningJohn Högberg2018-10-111-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'raimo/BSD-sockopt-pktoptions/ERIERL-187/OTP-14297' into maint-21Erlang/OTP2018-10-121-4/+3
| |\ \ \ \ \ \
| | * | | | | | Fix bug for sockopt pktoptions on BSDRaimo Niskanen2018-10-011-4/+3
| * | | | | | | erts: Fix memory leak on file read errorsJohn Högberg2018-09-261-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1974 from RaimoNiskanen/raimo/getifaddrs-netns/ERIERL-189...Raimo Niskanen2018-10-123-47/+156
|\ \ \ \ \ \ \
| * | | | | | | Implement {netns,NS} option for inet:getifaddrs/1Raimo Niskanen2018-10-023-47/+156
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'maint-17' into maintRickard Green2018-10-111-0/+97
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Prepare releaseErlang/OTP2018-10-112-1/+79
| * | | | | | Merge branch 'sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590' into m...Erlang/OTP2018-10-113-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maint-17Erlang/OTP2018-10-113-3/+96
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sverker/bin2term-zlib-bug/ERL-340/OTP-14159' into maint-17Erlang/OTP2018-10-111-7/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maint-17Erlang/OTP2018-10-111-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rickard/drv-send-term-thr-bug/OTP-13866' into maint-17Erlang/OTP2018-10-111-10/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/port-sig-dropped-fix/OTP-13424' into maint-17Erlang/OTP2018-10-111-1/+12
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maintSverker Eriksson2018-10-091-10/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | erts: Fix bug in ets:select_replace for bound keySverker Eriksson2018-10-091-10/+2
* | | | | | | | | | | | | Merge PR-1962 from gomoripeti/ms_bit_size OTP-15343Sverker Eriksson2018-10-041-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Document bit_size in match-specs and allow in fun2msPéter Gömöri2018-09-251-2/+5
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Fix spelling of intended in erl_nif docsLukas Larsson2018-10-011-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Prepare releaseErlang/OTP2018-09-242-1/+154
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Update copyright yearHenrik Nord2018-09-2117-17/+17
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'maint-19' into maintSverker Eriksson2018-09-201-0/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update release notesErlang/OTP2018-09-191-0/+16
| * | | | | | | | | | Update version numbersErlang/OTP2018-09-191-1/+1
| * | | | | | | | | | erts: Fix memory leak when sending to terminating portSverker Eriksson2018-09-191-3/+6
* | | | | | | | | | | Merge branch 'raimo/receive-TOS-TCLASS/ERIERL-187/OTP-15145' into maintRaimo Niskanen2018-09-191-44/+87
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix endianness bug for CMSG parsingRaimo Niskanen2018-09-191-44/+87
* | | | | | | | | | | | Merge branch 'sverker/erts/robustify-dist-entry-states/OTP-15297' into maintSverker Eriksson2018-09-1810-273/+234
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 'sverker/erts/fix-aborted-pending-connection-race/OTP-15296'Sverker Eriksson2018-09-183-48/+55
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | erts: Refactor port dist_entry & conn_id into PRTSDSverker Eriksson2018-09-185-30/+40
| * | | | | | | | | | | | | Remove ugly fail case macrosSverker Eriksson2018-09-181-22/+11
| * | | | | | | | | | | | | Consolidate distribution entry state transitionsSverker Eriksson2018-09-1810-225/+183
| * | | | | | | | | | | | | erts: Fix bug in undocumented system_flag(scheduling_statistics)Sverker Eriksson2018-09-111-1/+4
* | | | | | | | | | | | | | Merge branch 'raimo/receive-TOS-TCLASS/ERIERL-187/OTP-15145' into maintRaimo Niskanen2018-09-173-107/+620
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix term buffer overflow bugRaimo Niskanen2018-09-111-4/+10
| * | | | | | | | | | | | | Implement socket option recvtos and friendsRaimo Niskanen2018-09-043-108/+615