summaryrefslogtreecommitdiff
path: root/lib
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-173-2/+20
|\
| * Add nopush TCP socket optionIgor Slepchin2018-10-113-2/+20
* | 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-1210-12/+109
|\ \ \ | |/ /
| * | Prepare releaseErlang/OTP2018-10-126-3/+65
| * | 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-122-4/+30
| |\ \ \ \ \
| | * | | | | erts: Fix UNC path handling on WindowsJohn Högberg2018-10-112-4/+30
| * | | | | | 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-121-2/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix bug for sockopt pktoptions on BSDRaimo Niskanen2018-10-011-2/+2
* | | | | | | | Merge pull request #1974 from RaimoNiskanen/raimo/getifaddrs-netns/ERIERL-189...Raimo Niskanen2018-10-123-145/+291
|\ \ \ \ \ \ \ \
| * | | | | | | | Adjust test case to realityRaimo Niskanen2018-10-051-83/+89
| * | | | | | | | Implement {netns,NS} option for inet:getifaddrs/1Raimo Niskanen2018-10-022-62/+202
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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
* | | | | | | | | 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
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | ssl: ERL-738 - Correct alert handling with new TLS sender processIngela Anderton Andin2018-10-107-115/+152
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ingela/ssl/packet-options-to-tls-sender/OTP-15348' into maintIngela Anderton Andin2018-10-113-3/+92
|\ \ \ \ \ \ \
| * | | | | | | ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin2018-10-103-3/+92
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maintSverker Eriksson2018-10-091-1/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | erts: Fix bug in ets:select_replace for bound keySverker Eriksson2018-10-091-1/+21
* | | | | | | Merge branch 'peterdmv/inets/httpc-content-type/ERL-736/OTP-15339' into maintPéter Dimitrov2018-10-082-2/+20
|\ \ \ \ \ \ \
| * | | | | | | inets: Fix handling of 'Content-Type' (httpc)Péter Dimitrov2018-10-022-2/+20
* | | | | | | | Merge branch 'peterdmv/inets/httpc-content-length/ERL-733/OTP-15338' into maintPéter Dimitrov2018-10-082-13/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | inets: Fix handling of 'Content-Length' (httpc)Péter Dimitrov2018-10-022-13/+73
| |/ / / / / / /
* | | | | | | | Merge branch 'ingela/ssl/close-alert-ERL-738/OTP-15337' into maintIngela Anderton Andin2018-10-087-115/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | ssl: ERL-738 - Correct alert handling with new TLS sender processIngela Anderton Andin2018-10-087-115/+152
* | | | | | | | | Merge branch 'john/compiler/deterministic-paths/OTP-15245/ERL-706' into maintJohn Högberg2018-10-087-16/+97
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | compiler: Forward +source flag to epp and fix bug in +deterministicJohn Högberg2018-10-053-9/+40
| * | | | | | | | epp: Allow user to set source name independently of input file nameJohn Högberg2018-10-054-7/+57
* | | | | | | | | Merge PR-1962 from gomoripeti/ms_bit_size OTP-15343Sverker Eriksson2018-10-041-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Document bit_size in match-specs and allow in fun2msPéter Gömöri2018-09-251-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'raimo/test-cuddling' into maintRaimo Niskanen2018-10-031-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Decrease probability for failed histogramRaimo Niskanen2018-09-281-1/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'bjorn/compiler/fix-binary-matching/ERL-689/OTP-15335' into maintBjörn Gustavsson2018-10-033-15/+98
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix rare bug in binary matching (again)Björn Gustavsson2018-09-283-15/+98
| |/ / / / /
* | | | | | Update kernel, stdlib and sasl appups for OTP-21.2Siri Hansen2018-09-273-8/+12
|/ / / / /