aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-05-09Merge branch 'siri/logger-fix'Siri Hansen
* siri/logger-fix: Update reference manuals for logger Update some specs in logger
2018-05-09Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 ssh: Fix server crashes for exit-normal signals
2018-05-09Merge branch 'maint-19' into maintHans Nilsson
* maint-19: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 ssh: Fix server crashes for exit-normal signals Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh_connection_handler.erl lib/ssh/src/ssh_transport.erl lib/ssh/vsn.mk otp_versions.table
2018-05-09Update reference manuals for loggerSiri Hansen
2018-05-08Update some specs in loggerSiri Hansen
2018-05-08Merge pull request #1809 from erlang/dgud-string-deprDan Gudmundsson
Remove comments about deprecation in OTP-21
2018-05-08Updated OTP versionOTP-19.3.6.9Erlang/OTP
2018-05-08Prepare releaseErlang/OTP
2018-05-08Merge branch 'hans/ssh/reneg_bug_19/OTP-15066' into maint-19Erlang/OTP
* hans/ssh/reneg_bug_19/OTP-15066: ssh: Renegotiation -> renegotiate
2018-05-08Merge branch 'hans/ssh/dh_gex_putty_19/OTP-15064' into maint-19Erlang/OTP
* hans/ssh/dh_gex_putty_19/OTP-15064: ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419
2018-05-08Merge branch 'hans/ssh/server_exit_normal_exit_19/OTP-15018' into maint-19Erlang/OTP
* hans/ssh/server_exit_normal_exit_19/OTP-15018: ssh: Fix server crashes for exit-normal signals
2018-05-08Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 crypto: get_engine_load_cmd_list excluded if no engine support crypto: Fix compilation for LibreSSL 2.7.x crypto: Disable test_engine if engine is disabled crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h Conflicts: OTP_VERSION
2018-05-08Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release ssh: Renegotiation -> renegotiate ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419 crypto: get_engine_load_cmd_list excluded if no engine support crypto: Fix compilation for LibreSSL 2.7.x crypto: Disable test_engine if engine is disabled crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
2018-05-08Remove comments about deprecation in OTP-21dgud-string-deprDan Gudmundsson
I had missed the one in lower section.
2018-05-08Merge pull request #1801 from dtip/update-global-name-specHans Bolinder
Update global name typespec
2018-05-07Merge pull request #1800 from erszcz/masterHans Bolinder
Fix syntactic issues in EDoc comments across some libs
2018-05-07Updated OTP versionOTP-20.3.6Erlang/OTP
2018-05-07Prepare releaseErlang/OTP
2018-05-07Merge branch 'hans/ssh/reneg_bug_20/OTP-15066' into maint-20Erlang/OTP
* hans/ssh/reneg_bug_20/OTP-15066: ssh: Renegotiation -> renegotiate
2018-05-07Merge branch 'hans/ssh/dh_gex_putty/OTP-15064' into maint-20Erlang/OTP
* hans/ssh/dh_gex_putty/OTP-15064: ssh: Fix DH group exchange server bug for PuTTY and others following draft-draft-00 from 2001 and not the rfc4419
2018-05-07Merge branch 'hans/crypto/OPENSSL_NO_EC/OTP-15073' into maint-20Erlang/OTP
* hans/crypto/OPENSSL_NO_EC/OTP-15073: crypto: Disable test_engine if engine is disabled crypto: disable engine if OPENSSL_NO_EC* is set If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
2018-05-07Merge branch 'hans/crypto/libressl_errors/OTP-15074' into maint-20Erlang/OTP
* hans/crypto/libressl_errors/OTP-15074: crypto: get_engine_load_cmd_list excluded if no engine support crypto: Fix compilation for LibreSSL 2.7.x
2018-05-07Merge branch 'siri/logger-fix'Siri Hansen
* siri/logger-fix: Change logger callback removing_handler/1 to removing_handler/2 Don't crash logger_server due to unexpected message Add logger:update_process_metadata/1 Improve documentation of logger:set_*_config functions Change return type from logger_formatter:format/2 Improve test of logger_disk_log_h and logger_std_h Update logger documentation Set single_line=true by default in logger_formatter
2018-05-07Change logger callback removing_handler/1 to removing_handler/2Siri Hansen
2018-05-07Don't crash logger_server due to unexpected messageSiri Hansen
2018-05-07Add logger:update_process_metadata/1Siri Hansen
2018-05-07Improve documentation of logger:set_*_config functionsSiri Hansen
2018-05-07Change return type from logger_formatter:format/2Siri Hansen
This used to be string() is now changed to unicode:chardata().
2018-05-07Improve test of logger_disk_log_h and logger_std_hSiri Hansen
2018-05-07Update primary bootstrapBjörn Gustavsson
2018-05-07Update preloaded modulesBjörn Gustavsson
2018-05-07Merge pull request #1802 from michalmuskala/map-is-key-bifBjörn Gustavsson
Introduce is_map_key/2 guard BIF OTP-15037
2018-05-07Merge pull request #1805 from bjorng/bjorn/hipe/remove-unused-modulesBjörn Gustavsson
Remove unused source files in lib/hipe/opt
2018-05-07Merge branch 'john/tools/cuddle-lcnt-tests'John Högberg
* john/tools/cuddle-lcnt-tests: Ensure that lcnt server is terminated after lcnt:stop/0
2018-05-07Ensure that lcnt server is terminated after lcnt:stop/0John Högberg
This makes the nightly tests slightly more stable as they assert that the server isn't alive when lcnt:start/0 is called, which it could still be since the stop command was a plain gen_server call that didn't wait until the termination was completed.
2018-05-04ssh: Renegotiation -> renegotiateHans Nilsson
2018-05-04ssh: Fix DH group exchange server bug for PuTTYHans Nilsson
and others following draft-draft-00 from 2001 and not the rfc4419
2018-05-04Merge branch 'hans/ssh/rekey_limit/OTP-15069'Hans Nilsson
* hans/ssh/rekey_limit/OTP-15069: ssh: Extend rekey_limit to also take an optional time
2018-05-04ssh: Extend rekey_limit to also take an optional timeHans Nilsson
2018-05-04crypto: get_engine_load_cmd_list excluded if no engine supportHans Nilsson
2018-05-04crypto: Fix compilation for LibreSSL 2.7.xHans Nilsson
2018-05-04Fix syntactic issues in EDoc comments across some libsRadek Szymczyszyn
See https://github.com/erszcz/docsh/issues/23 for an explanation about how the files were found.
2018-05-04crypto: Disable test_engine if engine is disabledHans Nilsson
2018-05-04crypto: disable engine if OPENSSL_NO_EC* is setHans Nilsson
If that flag is set, and openssl/engine.h is included, there will be an erro further down in files included by engine.h
2018-05-04Remove unused source files in lib/hipe/optBjörn Gustavsson
Three of the removed source files don't even compile. Uncompilable source files cause problems for tools such as scripts/diffable that want to compile all found source files.
2018-05-04scripts/diffable: Include the hipe applicationBjörn Gustavsson
2018-05-04Merge pull request #1766 from seancribbs/add_erl_types_suiteHans Bolinder
Move erl_types test into a common_test suite
2018-05-04Merge branch 'bjorn/fix-typer-link'Björn Gustavsson
* bjorn/fix-typer-link: Fix the missing link to typer in an installed system
2018-05-04Merge branch 'john/kernel/add-file_int-to-release'John Högberg
* john/kernel/add-file_int-to-release: Add file_int.hrl to release target
2018-05-04Merge branch 'john/erts/fix-windows-symlinks/OTP-15062/ERL-615'John Högberg
* john/erts/fix-windows-symlinks/OTP-15062/ERL-615: Stop assuming that all NTFS reparse points are links