summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* ssl: Add scheduler utilization benchmark of plain/tls distLukas Larsson2018-11-292-1/+99
* ssl: Link to tstsrvr to group_leader in testLukas Larsson2018-11-291-1/+2
* ssl: Add some benchmarks to testLukas Larsson2018-11-291-4/+9
* Merge branch 'maint'Raimo Niskanen2018-10-221-2/+144
|\
| * Merge branch 'raimo/tcp-close-while-send/maint/ERL-561/OTP-12242' into maintRaimo Niskanen2018-10-221-2/+144
| |\
| | * Write test caseRaimo Niskanen2018-10-191-2/+144
* | | Merge branch 'maint'Ingela Anderton Andin2018-10-225-99/+117
|\ \ \ | |/ /
| * | Merge branch 'ingela/ssl/aead-refactor' into maintIngela Anderton Andin2018-10-225-99/+117
| |\ \
| | * | ssl: Refactor AEAD ciphersIngela Anderton Andin2018-10-195-99/+117
* | | | Merge branch 'maint'Hans Nilsson2018-10-191-0/+16
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-19' into maintHans Nilsson2018-10-191-0/+16
| |\ \ \
| | * | | Prepare releaseErlang/OTP2018-10-182-1/+17
| | * | | Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into mai...Erlang/OTP2018-10-181-3/+12
| | |\ \ \
* | | \ \ \ Merge branch 'maint'Siri Hansen2018-10-1912-185/+651
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #1975 from sirihansen/siri/logger/config-set-or-updateSiri Hansen2018-10-1912-185/+651
| |\ \ \ \ \
| | * | | | | [logger] Add handler callback filter_config/1Siri Hansen2018-10-038-6/+86
| | * | | | | [logger] Start using handler callback changing_config/3 in built-in handlersSiri Hansen2018-10-038-147/+414
| | * | | | | [logger] Add update_handler_config/3Siri Hansen2018-10-034-9/+90
| | * | | | | [logger] Add SetOrUpdate parameter to handler callback changing_configSiri Hansen2018-09-203-29/+67
* | | | | | | Merge branch 'maint'Siri Hansen2018-10-192-3/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'siri/cuddle' into maintSiri Hansen2018-10-192-3/+16
| |\ \ \ \ \ \
| | * | | | | | Fix gen_fsm_SUITE:start2/1 to terminate process synchronouslySiri Hansen2018-10-161-0/+2
| | * | | | | | Fix sys_SUITE:special_process/1 to terminating process synchronouslySiri Hansen2018-10-161-3/+14
* | | | | | | | Merge branch 'john/compiler/list_to_integer_2-is-pure'John Högberg2018-10-191-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | compiler: list_to_integer/2 is pureJohn Högberg2018-10-181-0/+1
* | | | | | | | | Merge branch 'maint'Hans Nilsson2018-10-181-1/+16
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-20' into maintHans Nilsson2018-10-181-1/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Prepare releaseErlang/OTP2018-10-162-1/+17
| | * | | | | | | | Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maint-20Erlang/OTP2018-10-161-1/+21
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into mai...Erlang/OTP2018-10-161-3/+12
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | Merge pull request #1978 from richcarl/ensure-nonempty-snameJohn Högberg2018-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not allow an empty string as node nameRichard Carlsson2018-10-081-1/+1
* | | | | | | | | | | | Merge branch 'maint'Sverker Eriksson2018-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | kernel: Fix spelling error in assert.hrllukas/kernel/docs-assertLukas Larsson2018-10-171-1/+1
* | | | | | | | | | | | Merge branch 'maint'John Högberg2018-10-173-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | 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 pull request #1970 from peterdmv/ssl/signature_algorithms/OTP-15248Péter Dimitrov2018-10-1610-108/+316
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ssl: Update default for option signature_algs_certPéter Dimitrov2018-10-152-8/+8
| * | | | | | | | | | | | eldap: Update default hash algorithm in FTPéter Dimitrov2018-10-151-2/+2
| * | | | | | | | | | | | ssl: Test hash/signature algorithm selectionPéter Dimitrov2018-10-151-2/+54
| * | | | | | | | | | | | ssl: Filter "signature_algs_cert" from socket optionsPéter Dimitrov2018-10-151-2/+10
| * | | | | | | | | | | | ssl: Implement Signature Algorithms (TLS 1.3)Péter Dimitrov2018-10-157-92/+204
| * | | | | | | | | | | | ssl: Document ssl option "signature_algs_cert"Péter Dimitrov2018-10-151-2/+38
* | | | | | | | | | | | | Merge branch 'maint'John Högberg2018-10-161-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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'Rickard Green2018-10-129-11/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'maint-21' into maintRickard Green2018-10-1210-12/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Prepare releaseErlang/OTP2018-10-126-3/+65