summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* erts: Revert small doc change sverker/doc-fix-billionSverker Eriksson2020-06-161-1/+1
| | | Avoid "billion" as it can be ambiguous depending on language.
* Merge branch 'bmk/kernel/esock/20200608/test_tweaking' into maintMicael Karlberg2020-06-161-2/+26
|\
| * [kernel|esock|test] Adjust hoplimit test case(s)Micael Karlberg2020-06-091-2/+26
| | | | | | | | | | The two hoplimit test cases, needs to be skip'ed on Montavista (atleast on one very old version).
* | Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson2020-06-167-26/+333
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hans/ssh/cuddle_tests: ssh: Test {tsflg,[{one_more,true}]} ssh: Check user_dir_fun option ssh: Test quiet-mode option ssh: Testcase for encode/decode of pty_opts ssh: ct:pal -> ct:log ssh: Two new test cases for ssh:shell ssh: Added missing test case for keyboard-interactive
| * | ssh: Test {tsflg,[{one_more,true}]}Hans Nilsson2020-06-162-2/+25
| | | | | | | | | | | | which tests a server requiring an extra message
| * | ssh: Check user_dir_fun optionHans Nilsson2020-06-162-5/+70
| | |
| * | ssh: Test quiet-mode optionHans Nilsson2020-06-161-0/+1
| | |
| * | ssh: Testcase for encode/decode of pty_optsHans Nilsson2020-06-161-0/+28
| | |
| * | ssh: ct:pal -> ct:logHans Nilsson2020-06-162-3/+3
| | |
| * | ssh: Two new test cases for ssh:shellHans Nilsson2020-06-162-16/+113
| | |
| * | ssh: Added missing test case for keyboard-interactiveHans Nilsson2020-06-161-0/+93
| | |
* | | Merge branch 'hans/ssh/inc_test_coverage/OTP-14106' into maintHans Nilsson2020-06-1627-147/+372
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hans/ssh/inc_test_coverage/OTP-14106: ssh: Minor shell option coverage fix ssh: Make encode_pty_opts/decode_pty_opts testable ssh: Better coverage of dbg of authentication ssh: Better coverage of ssh_options ssh: Reneg dbg cover improvments ssh: Increase coverage on ssh_dbg code ssh: Make version handling more efficient ssh: Exclude some more modules from coverage ssh: Two new cover specs
| * | ssh: Minor shell option coverage fixHans Nilsson2020-06-162-5/+6
| | |
| * | ssh: Make encode_pty_opts/decode_pty_opts testableHans Nilsson2020-06-161-0/+3
| | |
| * | ssh: Better coverage of dbg of authenticationHans Nilsson2020-06-1616-5/+193
| | |
| * | ssh: Better coverage of ssh_optionsHans Nilsson2020-06-161-34/+34
| | |
| * | ssh: Reneg dbg cover improvmentsHans Nilsson2020-06-162-2/+4
| | |
| * | ssh: Increase coverage on ssh_dbg codeHans Nilsson2020-06-165-82/+81
| | |
| * | ssh: Make version handling more efficientHans Nilsson2020-06-162-19/+10
| | | | | | | | | | | | | | | | | | | | | Raise coverage: ssh_transport 0.8610 -> 0.8625 ssh_options 0.7167 -> 0.7192 total 0.7277 -> 0.7284
| * | ssh: Exclude some more modules from coverageHans Nilsson2020-06-161-1/+19
| | |
| * | ssh: Two new cover specsHans Nilsson2020-06-162-0/+23
|/ / | | | | | | One is for all ssh files, while the other is for a more realistic subset
* | Merge branch 'ingela/ssl/recv-corner-case/ERIERL-496/OTP-16697' into maintIngela Anderton Andin2020-06-166-39/+91
|\ \ | | | | | | | | | | | | | | | | | | * ingela/ssl/recv-corner-case/ERIERL-496/OTP-16697: inets: Handle that inet/ssl:setopt can return error ftp: Handle that inet/ssl:setopts can return error ssl: Avoid possible sending an active message to a passive socket
| * | inets: Handle that inet/ssl:setopt can return errorIngela Anderton Andin2020-06-154-32/+41
| | |
| * | ftp: Handle that inet/ssl:setopts can return errorIngela Anderton Andin2020-06-111-5/+14
| | |
| * | ssl: Avoid possible sending an active message to a passive socketIngela Anderton Andin2020-06-112-4/+38
| | | | | | | | | | | | | | | | | | In the corner case that a passive socket is started and ssl:recv never is called and the other side closes the socket, an active close message could incorrectly be sent to a passive socket.
* | | Merge branch 'bmk/snmp/20200612/compile_warning_in_ex2/OTP-16716' into maintMicael Karlberg2020-06-151-4/+4
|\ \ \ | | | | | | | | | | | | OTP-16716
| * | | [snmp] Fix example 2 regarding compiler warningsMicael Karlberg2020-06-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The second example (ex2) used deprecated functions. OTP-16716
* | | | Merge branch 'sverker/atomics-counters-doc' into maintSverker Eriksson2020-06-153-15/+18
|\ \ \ \
| * | | | erts: Improve ref docs of atomics, counters and erlangSverker Eriksson2020-06-153-15/+18
| | |_|/ | |/| |
* | | | Merge pull request #2660 from IngelaAndin/aronisstav/ssl/doc-fixIngela Andin2020-06-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix small typo in using_ssl.xml
| * | | | Fix small typo in using_ssl.xmlStavros Aronis2020-06-151-1/+1
|/ / / / | | | | | | | | The return value does not match the pattern on the preceding line.
* | | | Merge branch 'lars/erl_docgen/cleanup-warnings/OTP-16675' into maintLars Thorsen2020-06-151-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * lars/erl_docgen/cleanup-warnings/OTP-16675: Remove trailing whitespaces Remove compile time warning
| * | | | Remove trailing whitespacesLars Thorsen2020-06-101-5/+5
| | | | |
| * | | | Remove compile time warningLars Thorsen2020-06-101-1/+1
| | | | |
* | | | | Merge branch 'lars/xmerl/fix-wsl-test-case-bug' into maintLars Thorsen2020-06-153-34/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * lars/xmerl/fix-wsl-test-case-bug: Test suite cuddling
| * | | | | Test suite cuddlingLars Thorsen2020-06-153-34/+37
|/ / / / / | | | | | | | | | | | | | | | | | | | | Remove compile warnings for test suites Fix problem when running tests under windows
* | | | | Merge branch 'ingela/ssl/openssl-cuddle' into maintIngela Anderton Andin2020-06-152-27/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ingela/ssl/openssl-cuddle: ssl: Remove warnings ssl: Remove error prone OpenSSL server up verification
| * | | | | ssl: Remove warningsIngela Anderton Andin2020-06-151-2/+2
| | | | | |
| * | | | | ssl: Remove error prone OpenSSL server up verificationIngela Anderton Andin2020-06-151-25/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | It is replaced by the function ssl_test_lib:wait_for_openssl_server/2 that has a more reliable way for testing this.
* | | | | Merge branch 'ingela/inets/cuddle' into maintIngela Anderton Andin2020-06-151-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ingela/inets/cuddle: inets: Raise timeout for potentially slow test
| * | | | | inets: Raise timeout for potentially slow testIngela Anderton Andin2020-06-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test ought to be replaced by a better designed bench mark. But we raise the timeout for now.
* | | | | | Merge branch 'rickard/faulty-port-assert-fix/OTP-16717' into maintRickard Green2020-06-131-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | * rickard/faulty-port-assert-fix/OTP-16717: Change faulty assert checking that port is not dead at reschedule
| * | | | | Change faulty assert checking that port is not dead at rescheduleRickard Green2020-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After scheduled execution of port tasks, a port is rescheduled if there still remain scheduled port tasks on it. The assert checked that the port was not in state ERTS_PORT_SFLGS_DEAD (which is either ERTS_PORT_SFLG_FREE or ERTS_PORT_SFLG_INITIALIZING) when being rescheduled. The port can however be set in state ERTS_PORT_SFLG_FREE between the point where it is determined that it needs to be rescheduled (finalize_exec()) and the actual rescheduling where the assert is. This situation is however not an issue. When this happens the port will be rescheduled and later selected for execution. The first thing that happens when it begins executing is that it will complete termination since it is in state ERTS_PORT_SFLG_FREE. The modified assert now only checks that the port is not in state ERTS_PORT_SFLG_INITIALIZING.
* | | | | | Merge pull request #2657 from IngelaAndin/ingela/contributionsIngela Andin2020-06-121-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify how to make contributions
| * | | | | | Clarify how to make contributionsIngela Anderton Andin2020-06-121-2/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want it to be as easy as possible to review a pull request without breaking the possibility to use bisect. The need for improvement was discovered due to PR-1968 and a first enhancement proposal made in PR-2652, but we discovered it needed to be reworded to fulfill our whole requirement.
* | | | | | Merge branch 'ingela/ssl/windows-cuddle' into maintIngela Anderton Andin2020-06-111-11/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ingela/ssl/windows-cuddle: ssl: Always use "portable_open_port" to execute OpenSSL
| * | | | | | ssl: Always use "portable_open_port" to execute OpenSSLIngela Anderton Andin2020-06-101-11/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sverker/doc/fix-hidden-since/ERL-1259/OTP-16661' into maintSverker Eriksson2020-06-113-21/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sverker/doc/fix-hidden-since/ERL-1259/OTP-16661: Prevent left nav overlapping content during scroll (again) Refactor HTML layout to not use width > 100%
| * | | | | | Prevent left nav overlapping content during scroll (again)Sverker Eriksson2020-06-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked eeff274e6f37b03c77544b5c653714861c4052dc the already merged and then reverted PR-2571. When viewed on a smaller screen the content can be scrolled not only up and down, but also left and right. More specifically it can be scrolled back over the navigation menu to the left. This prevents that, and as an bonus it fixes the scrolling to the right where there is no content.
| * | | | | | Refactor HTML layout to not use width > 100%Sverker Eriksson2020-06-113-20/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which causes problem with "overflow-x: hidden" In short: Increased the width +10em to fit the "since" versions while retaining the right margin of other text.
View Lorry Controller Status