summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2381 from jhogberg/john/erts/refactor-cif-tracing/OTP-14734John Högberg2019-09-178-223/+311
|\
| * compiler: Honor stack frames when calling exit BIFsJohn Högberg2019-09-098-223/+311
* | Merge branch 'john/kernel/fix-shell-history/PR-2302'John Högberg2019-09-161-5/+9
|\ \
| * | kernel: Fix accidental disabling of shell historyJohn Högberg2019-09-111-5/+9
* | | Merge branch 'hans/ssh/client_sup/OTP-16026'Hans Nilsson2019-09-132-17/+74
|\ \ \
| * | | ssh: Extend the sshc_sup testsHans Nilsson2019-09-121-5/+51
| * | | ssh: Fix ssh_info module so it reports tunnel channelsHans Nilsson2019-09-111-12/+23
* | | | Merge branch 'maint'Anders Svensson2019-09-131-2/+9
|\ \ \ \
| * \ \ \ Merge branch 'anders/common_test/NETCONF-1.1/OTP-15789' into maintAnders Svensson2019-09-131-2/+9
| |\ \ \ \
| | * | | | Fix doc attributesAnders Svensson2019-09-121-2/+9
* | | | | | Merge branch 'maint'Péter Dimitrov2019-09-121-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'peterdmv/ssl/fix-option-handling' into maintPéter Dimitrov2019-09-121-1/+3
| |\ \ \ \ \
| | * | | | | ssl: Fix option handlingPéter Dimitrov2019-09-111-1/+3
* | | | | | | Merge branch 'maint'Raimo Niskanen2019-09-121-12/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'raimo/stdlib/gen_statem-improve-timers/OTP-15510' into maintRaimo Niskanen2019-09-121-12/+24
| |\ \ \ \ \ \
| | * | | | | | Improve pointer to User's GuideRaimo Niskanen2019-09-121-12/+24
| * | | | | | | Merge branch 'anders/common_test/NETCONF-1.1/OTP-15789' into maintAnders Svensson2019-09-122-763/+1170
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch 'maint'Ingela Anderton Andin2019-09-124-3/+67
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-21' into maintIngela Anderton Andin2019-09-124-3/+67
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Prepare releaseErlang/OTP2019-09-118-5/+72
| | * | | | | | Merge branch 'ingela/inets/httpd-status-code/OTP-16049' into maint-21Erlang/OTP2019-09-112-14/+36
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'hans/ssh/early_crash_fail_logging/ERL-990/OTP-15962' into maint-21Erlang/OTP2019-09-111-42/+73
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'zadean/syntax_tools/add_missing_unwrap/OTP-16012/PR-2348' into ...Erlang/OTP2019-09-113-25/+64
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ Merge branch 'maint'Raimo Niskanen2019-09-112-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'raimo/stdlib/gen_statem-improve-timers/OTP-15510' into maintRaimo Niskanen2019-09-112-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Fix auto timer cancel bugRaimo Niskanen2019-09-112-2/+3
* | | | | | | | | | | Merge branch 'anders/common_test/NETCONF-1.1/OTP-15789'Anders Svensson2019-09-112-763/+1170
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Tweak documentationAnders Svensson2019-09-102-119/+122
| * | | | | | | | | | Fix handling of non-RPC replyAnders Svensson2019-06-061-1/+1
| * | | | | | | | | | Simplify request timersAnders Svensson2019-06-061-47/+40
| * | | | | | | | | | Fix inaccurate commentAnders Svensson2019-06-051-3/+4
| * | | | | | | | | | Replace create_subscription/1-6 in 15 variantsAnders Svensson2019-06-052-148/+128
| * | | | | | | | | | Fix documentation/spec of ssh-related optionsAnders Svensson2019-06-052-9/+14
| * | | | | | | | | | Be flexible with capabilities specificationAnders Svensson2019-06-032-7/+27
| * | | | | | | | | | Document connect/hello timeout in one placeAnders Svensson2019-06-031-18/+8
| * | | | | | | | | | Let capabilities be set for all session establishmentAnders Svensson2019-06-032-155/+224
| * | | | | | | | | | Handle reception of invalid session-idAnders Svensson2019-06-031-16/+22
| * | | | | | | | | | Add ct_netconfc support for NETCONF 1.1Anders Svensson2019-05-292-285/+625
| * | | | | | | | | | Don't treat reception of NETCONF > 1.0 hello as errorAnders Svensson2019-05-161-4/+4
* | | | | | | | | | | Merge branch 'maint'Hans Nilsson2019-09-111-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'hans/ftp/break_infinit_loop/OTP-16056' into maintHans Nilsson2019-09-111-2/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ftp: Break loopHans Nilsson2019-09-101-2/+5
| * | | | | | | | | | | Merge branch 'ingela/inets/httpd-status-code/OTP-16049' into maintIngela Anderton Andin2019-09-112-14/+36
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'maint'Hans Nilsson2019-09-101-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'hans/ssh/connection_info_update_doc/OTP-16040' into maintHans Nilsson2019-09-101-0/+12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ssh: Type daemon_info_tuple added in docHans Nilsson2019-09-091-0/+12
* | | | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2019-09-103-15/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/compiler-warning' into maintIngela Anderton Andin2019-09-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | ssl: Remove unused variable warningIngela Anderton Andin2019-09-091-1/+1
| * | | | | | | | | | | | | Merge branch 'ingela/inets/httpd-status-code/OTP-16049' into maintIngela Anderton Andin2019-09-102-14/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
View Lorry Controller Status