summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* kernel: Fix spelling error in assert.hrllukas/kernel/docs-assertLukas Larsson2018-10-171-1/+1
* Merge branch 'igor/tcp-nopush-ERL-698/OTP-15357' into maintJohn Högberg2018-10-176-3/+76
|\
| * "cork" tcp socket around file:sendfileIgor Slepchin2018-10-111-1/+23
| * Add nopush TCP socket optionIgor Slepchin2018-10-115-2/+53
* | Merge branch 'sverker/erts/18/memory-leak-terminating-port/OTP-14609' into maintSverker Eriksson2018-10-160-0/+0
|\ \
| * | erts: Fix memory leak when sending to terminating portSverker Eriksson2018-09-191-3/+6
* | | Merge branch 'john/compiler/bs_match-anno-liveness-fix/OTP-15353/ERL-753' int...John Högberg2018-10-162-2/+21
|\ \ \
| * | | beam_utils: Handle bs_start_match2 in anno_defsJohn Högberg2018-10-152-2/+21
* | | | Merge branch 'maint-21' into maintRickard Green2018-10-1218-78/+249
|\ \ \ \ | |/ / /
| * | | Updated OTP versionOTP-21.1.1Erlang/OTP2018-10-122-1/+2
| * | | Prepare releaseErlang/OTP2018-10-129-4/+101
| * | | Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into m...Erlang/OTP2018-10-123-2/+90
| |\ \ \
| * \ \ \ Merge branch 'ingela/maint/ssl/close-alert-ERL-738/OTP-15337' into maint-21Erlang/OTP2018-10-127-115/+152
| |\ \ \ \
| * \ \ \ \ Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into mai...Erlang/OTP2018-10-121-3/+12
| |\ \ \ \ \
| | * | | | | eldap: Fix race at socket closeHans Nilsson2018-10-051-3/+12
| * | | | | | Merge branch 'john/erts/fix-unc-paths-windows/OTP-15333/ERL-737' into maint-21Erlang/OTP2018-10-123-58/+133
| |\ \ \ \ \ \
| | * | | | | | erts: Fix UNC path handling on WindowsJohn Högberg2018-10-113-57/+132
| | * | | | | | erts: Fix a compiler warningJohn Högberg2018-10-111-1/+1
| * | | | | | | Merge branch 'bjorn/compiler/fix-binary-matching/ERL-689/OTP-15335' into main...Erlang/OTP2018-10-123-15/+98
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'raimo/BSD-sockopt-pktoptions/ERIERL-187/OTP-14297' into maint-21Erlang/OTP2018-10-122-6/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix bug for sockopt pktoptions on BSDRaimo Niskanen2018-10-012-6/+5
| * | | | | | | | | Merge branch 'john/erts/fix-prim_file-error-leak/OTP-15318' into maint-21Erlang/OTP2018-10-121-0/+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-126-192/+447
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adjust test case to realityRaimo Niskanen2018-10-051-83/+89
| * | | | | | | | | Implement {netns,NS} option for inet:getifaddrs/1Raimo Niskanen2018-10-025-109/+358
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint-17' into maintRickard Green2018-10-113-0/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated OTP versionOTP-17.5.6.10maint-17Erlang/OTP2018-10-112-1/+2
| * | | | | | | | | Prepare releaseErlang/OTP2018-10-113-1/+85
| * | | | | | | | | 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 'hans/crypto/fix_RSA_opts/OTP-15302' into maintHans Nilsson2018-10-113-111/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | crypto: Update RSA tests after algorithms doc chapterHans Nilsson2018-10-111-78/+93
| * | | | | | | | | | | | | | | | crypto: Update RSA options to match specs and different OpenSSL versionsHans Nilsson2018-10-112-33/+88
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'pr/1949' into maintDan Gudmundsson2018-10-119-128/+212
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Run emacs tests from test_suiteDan Gudmundsson2018-10-093-157/+107
| * | | | | | | | | | | | | | | | Emacs: consider case in erlang-get-identifier-at-pointJohan Claesson2018-10-092-13/+15
| * | | | | | | | | | | | | | | | Emacs: do not accept compiler warnings in selected elisp filesJohan Claesson2018-10-099-79/+112
| * | | | | | | | | | | | | | | | Emacs: add test-erlang-modeJohan Claesson2018-10-092-23/+122
* | | | | | | | | | | | | | | | | Merge branch 'ingela/ssl/merge-fix' into maintIngela Anderton Andin2018-10-111-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | ssl: Fix up incorrect automatic mergeIngela Anderton Andin2018-10-111-7/+0
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into m...Ingela Anderton Andin2018-10-111-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin2018-10-113-2/+90
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ingela/maint/ssl/packet-options-to-tls-sender/OTP-15348' into m...Ingela Anderton Andin2018-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin2018-10-103-2/+91
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ingela/maint/ssl/close-alert-ERL-738/OTP-15337' into maintIngela Anderton Andin2018-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |