summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hans/ssh/inc_test_coverage/OTP-14106' into maintHans Nilsson2020-06-1627-147/+372
|\
| * 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
| * ssh: Exclude some more modules from coverageHans Nilsson2020-06-161-1/+19
| * ssh: Two new cover specsHans Nilsson2020-06-162-0/+23
|/
* Merge branch 'ingela/ssl/recv-corner-case/ERIERL-496/OTP-16697' into maintIngela Anderton Andin2020-06-166-39/+91
|\
| * 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
* | Merge branch 'bmk/snmp/20200612/compile_warning_in_ex2/OTP-16716' into maintMicael Karlberg2020-06-151-4/+4
|\ \
| * | [snmp] Fix example 2 regarding compiler warningsMicael Karlberg2020-06-121-4/+4
* | | 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.xmlStavros Aronis2020-06-151-1/+1
|/ / / /
* | | | Merge branch 'lars/erl_docgen/cleanup-warnings/OTP-16675' into maintLars Thorsen2020-06-151-6/+6
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | Test suite cuddlingLars Thorsen2020-06-153-34/+37
|/ / / / /
* | | | | Merge branch 'ingela/ssl/openssl-cuddle' into maintIngela Anderton Andin2020-06-152-27/+4
|\ \ \ \ \
| * | | | | ssl: Remove warningsIngela Anderton Andin2020-06-151-2/+2
| * | | | | ssl: Remove error prone OpenSSL server up verificationIngela Anderton Andin2020-06-151-25/+2
|/ / / / /
* | | | | Merge branch 'ingela/inets/cuddle' into maintIngela Anderton Andin2020-06-151-1/+3
|\ \ \ \ \
| * | | | | inets: Raise timeout for potentially slow testIngela Anderton Andin2020-06-151-1/+3
* | | | | | Merge branch 'rickard/faulty-port-assert-fix/OTP-16717' into maintRickard Green2020-06-131-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Change faulty assert checking that port is not dead at rescheduleRickard Green2020-06-121-1/+2
* | | | | | Merge pull request #2657 from IngelaAndin/ingela/contributionsIngela Andin2020-06-121-2/+5
|\ \ \ \ \ \
| * | | | | | Clarify how to make contributionsIngela Anderton Andin2020-06-121-2/+5
|/ / / / / /
* | | | | | Merge branch 'ingela/ssl/windows-cuddle' into maintIngela Anderton Andin2020-06-111-11/+8
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | Prevent left nav overlapping content during scroll (again)Sverker Eriksson2020-06-111-1/+2
| * | | | | | Refactor HTML layout to not use width > 100%Sverker Eriksson2020-06-113-20/+65
* | | | | | | Merge branch 'hans/crypto/bad_spec_revisited/ERL-1257/OTP-16658' into maintHans Nilsson2020-06-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | crypto: Remove no_return()Hans Nilsson2020-06-041-2/+2
* | | | | | | | Merge 'sverker/erts/load_nif-race-bug/ERL-1273/OTP-16704' into maintSverker Eriksson2020-06-114-3/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | erts: Add test nif_SUITE:t_call_nif_earlySverker Eriksson2020-06-103-3/+89
| * | | | | | | | erts: Add test nif_SUITE:t_load_raceSverker Eriksson2020-06-092-0/+44
* | | | | | | | | Merge branch 'rickard/test-cuddle' into maintRickard Green2020-06-112-2/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ei_accpet_SUITE:ei_threaded_accept testcaseRickard Green2020-06-092-2/+27
* | | | | | | | | | Merge pull request #2655 from tony612/set-quota-for-less-1John Högberg2020-06-111-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | erts: set quota to 1 if cpu quota is less than 1Tony Han2020-06-111-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bjorn/stdlib/fix-wildcard/OTP-16700' into maintBjörn Gustavsson2020-06-112-4/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix filelib:wildcard/1,2 for "not-a-directory/.."Björn Gustavsson2020-06-092-4/+36