summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Hans Bolinder2019-10-183-9/+8
|\
| * Merge branch 'hasse/debugger/fix_printing_atoms/OTP-16186' into maintHans Bolinder2019-10-183-9/+8
| |\
| | * debugger: Print Unicode atoms consistentlyHans Bolinder2019-10-163-9/+8
* | | Merge branch 'maint'Micael Karlberg2019-10-181-5/+5
|\ \ \ | |/ /
| * | Merge branch 'bmk/snmp/manager/20191017/compiler_warning_cleanup' into maintMicael Karlberg2019-10-181-5/+5
| |\ \
| | * | [snmp|manager] Moved a (function) clause to remove warningMicael Karlberg2019-10-171-5/+5
* | | | Merge branch 'maint'Péter Dimitrov2019-10-182-38/+109
|\ \ \ \ | |/ / /
| * | | Merge branch 'peterdmv/ssl/psk-5' into maintPéter Dimitrov2019-10-182-38/+109
| |\ \ \ | | |/ / | |/| |
| | * | ssl: Validate binder and ticket agePéter Dimitrov2019-10-172-38/+109
| | |/
* | | Merge branch 'maint'Rickard Green2019-10-162-3/+25
|\ \ \ | |/ /
| * | Merge branch 'rickard/unicode-error/OTP-16052' into maintRickard Green2019-10-162-3/+25
| |\ \ | | |/ | |/|
| | * Fix error report for large integers in unicode:characters_to_*()Rickard Green2019-10-162-3/+25
* | | Merge branch 'maint'Péter Dimitrov2019-10-163-3/+476
|\ \ \ | |/ /
| * | Merge branch 'peterdmv/ssl/psk-4' into maintPéter Dimitrov2019-10-163-3/+476
| |\ \
| | * | ssl: Test session resumption with hello_retry_requestPéter Dimitrov2019-10-151-2/+248
| | * | ssl: Add basic test for session resumptionPéter Dimitrov2019-10-151-7/+122
| | * | ssl: Update cipher state when sending ticketPéter Dimitrov2019-10-151-3/+3
| | * | ssl: Add ssl_session_ticket_SUITEPéter Dimitrov2019-10-152-0/+112
* | | | Merge branch 'maint'Björn Gustavsson2019-10-162-5/+11
|\ \ \ \ | |/ / /
| * | | Merge pull request #2418 from bjorng/bjorn/compiler/core-lint/ERL-1065/OTP-16181Björn Gustavsson2019-10-162-5/+11
| |\ \ \
| | * | | Always run the core_lint pass when compiling from Core ErlangBjörn Gustavsson2019-10-142-5/+11
| | |/ /
* | | | Merge branch 'maint'Micael Karlberg2019-10-164-13/+78
|\ \ \ \ | |/ / /
| * | | Merge branch 'bmk/snmp/20190918/test_tweaking' into maintMicael Karlberg2019-10-164-13/+78
| |\ \ \
| | * | | [snmp|test] Attempt to skip tests of two machines...Micael Karlberg2019-09-271-1/+34
| | * | | [snmp|test] Make system monitor be informativeMicael Karlberg2019-09-253-5/+29
| | * | | [snmp|test] Make reset-events synchronousMicael Karlberg2019-09-181-4/+6
| | * | | [snmp|test] Include the number of (received) events in msgMicael Karlberg2019-09-181-5/+6
| | * | | [snmp|test] Inform when reset eventsMicael Karlberg2019-09-181-0/+5
* | | | | Merge branch 'maint'Hans Nilsson2019-10-163-160/+383
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'hans/ssh/exec_users_guide_refresh/OTP-16108' into maintHans Nilsson2019-10-163-160/+383
| |\ \ \ \
| | * | | | ssh: Update the 'exec' documentationHans Nilsson2019-10-162-139/+377
| | * | | | ssh: Add references to the exec doc from the refmanHans Nilsson2019-10-162-21/+6
* | | | | | Merge branch 'maint'Hans Nilsson2019-10-161-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ssh: Fix cli problems at line endHans Nilsson2019-10-161-2/+6
| |/ / / /
* | | | | Merge branch 'maint'Péter Dimitrov2019-10-161-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'maint-21' into maintPéter Dimitrov2019-10-161-0/+15
| |\ \ \ \
| | * | | | Prepare releaseErlang/OTP2019-10-162-2/+17
| | * | | | Merge branch 'ingela/main-21/inets/httpd/error-log-with-logger/OTP-16019' int...Erlang/OTP2019-10-1620-313/+407
| | |\ \ \ \
| | | * | | | inets, httpd: Add logger error loggingIngela Anderton Andin2019-10-1520-312/+415
* | | | | | | Merge branch 'maint'Micael Karlberg2019-10-151-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'bmk/snmp/20191002/capital_man6_man_page_name' into maintMicael Karlberg2019-10-151-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [snmp|doc] App name in capital lettersMicael Karlberg2019-10-021-3/+3
* | | | | | | Merge branch 'bjorn/compiler/misc'Björn Gustavsson2019-10-143-10/+32
|\ \ \ \ \ \ \
| * | | | | | | Cover beam_ssa_opt:opt_ssa_sink/1Björn Gustavsson2019-10-141-0/+15
| * | | | | | | Cover beam_ssa_opt:ssa_opt_element/1Björn Gustavsson2019-10-141-0/+16
| * | | | | | | Simplify handling of unsafe funsBjörn Gustavsson2019-10-111-10/+1
* | | | | | | | Merge branch 'maint'Ingela Anderton Andin2019-10-142-26/+30
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'ingela/ssl/test-send-recv-diffrent-proc' into maintIngela Anderton Andin2019-10-142-26/+30
| |\ \ \ \ \ \ \
| | * | | | | | | ssl: Do not send and receive from same processIngela Anderton Andin2019-10-142-26/+30
* | | | | | | | | Merge branch 'maint'Hans Nilsson2019-10-143-2/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /