summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * ssl: TLS sender process needs to get updates of the socket option packetIngela Anderton Andin2018-10-113-2/+90
* | Merge branch 'ingela/maint/ssl/close-alert-ERL-738/OTP-15337' into maint-21Erlang/OTP2018-10-127-115/+152
|\ \ | |/
| * ssl: ERL-738 - Correct alert handling with new TLS sender processIngela Anderton Andin2018-10-107-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
|\ \ \
| * | | Fix rare bug in binary matching (again)Björn Gustavsson2018-09-283-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
|/ / /
* | | Updated OTP versionOTP-21.1Erlang/OTP2018-09-242-1/+2
* | | Prepare releaseErlang/OTP2018-09-2475-45/+1316
* | | Merge branch 'ingela/ftp/tftp/app.src-fix' into maintIngela Anderton Andin2018-09-242-2/+2
|\ \ \
| * | | ftp, tftp: Version should not be hardcoded in <app>.app.srcIngela Anderton Andin2018-09-242-2/+2
* | | | Merge branch 'hans/crypto/fix_bad_merge' into maintHans Nilsson2018-09-211-13/+6
|\ \ \ \ | |/ / /
| * | | crypto: Fix accidental mergeHans Nilsson2018-09-211-13/+6
|/ / /
* | | Update copyright yearHenrik Nord2018-09-21108-108/+108
|/ /
* | Merge branch 'ingela/ssl/openssl-test-interop' into maintIngela Anderton Andin2018-09-202-85/+116
|\ \
| * | ssl: Improve interop checksIngela Anderton Andin2018-09-202-85/+116
* | | Merge branch 'maint-19' into maintSverker Eriksson2018-09-202-0/+17
|\ \ \ | |/ / |/| |
| * | Updated OTP versionOTP-19.3.6.11Erlang/OTP2018-09-192-1/+2
| * | Update release notesErlang/OTP2018-09-191-0/+16
| * | Update version numbersErlang/OTP2018-09-191-1/+1
| * | Merge branch 'sverker/erts/19/memory-leak-terminating-port/OTP-14609' into ma...Erlang/OTP2018-09-191-3/+6
| |\ \
| | * | erts: Fix memory leak when sending to terminating portSverker Eriksson2018-09-191-3/+6
| |/ /
* | | Merge branch 'ingela/ERL-622/fix' into maintIngela Anderton Andin2018-09-202-2/+3
|\ \ \
| * | | ssl: Move link to correct processIngela Anderton Andin2018-09-202-2/+3
* | | | Merge branch 'raimo/receive-TOS-TCLASS/ERIERL-187/OTP-15145' into maintRaimo Niskanen2018-09-194-56/+135
|\ \ \ \
| * | | | Elaborate the disclaimer for 'pktoptions'Raimo Niskanen2018-09-191-1/+13
| * | | | Improve platform filterRaimo Niskanen2018-09-192-11/+35
| * | | | Fix endianness bug for CMSG parsingRaimo Niskanen2018-09-191-44/+87
* | | | | Merge branch 'hans/crypto/cuddle_docs' into maintHans Nilsson2018-09-193-42/+178
|\ \ \ \ \
| * | | | | crypto: Re-work the 'Description' sectionHans Nilsson2018-09-191-35/+144
| * | | | | crypto: Add warnings in RefMan and User's Guide for experimental RSA optsHans Nilsson2018-09-183-7/+34
|/ / / / /
* | | | | Merge branch 'maint-20' into maintJohn Högberg2018-09-182-0/+17
|\ \ \ \ \
| * | | | | Updated OTP versionOTP-20.3.8.9Erlang/OTP2018-09-112-1/+2
| * | | | | Update release notesErlang/OTP2018-09-111-0/+16
| * | | | | Update version numbersErlang/OTP2018-09-111-1/+1
| * | | | | Merge branch 'john/compiler/fix-rebar-recompiles-maint-20/OTP-15292' into mai...Erlang/OTP2018-09-111-1/+0
| |\ \ \ \ \
| | * | | | | Fix include-path regression caused by dd0a39cJohn Högberg2018-09-101-1/+0
| |/ / / / /
* | | | | | Merge branch 'sverker/erts/robustify-dist-entry-states/OTP-15297' into maintSverker Eriksson2018-09-1812-319/+262
|\ \ \ \ \ \
| * \ \ \ \ \ 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