aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-10-17[rb] Don't fail for unexpected type of reportSiri Hansen
rb would fail to show an error_logger report which was not a list. This is now corrected and any term is allowed (as specified in the error_logger reference manual).
2017-10-17Merge branch 'lukas/jinterface/disable-travis' into maintLukas Larsson
* lukas/jinterface/disable-travis: jinterface: Skip tests when hostname cannot be resolved
2017-10-16Merge branch 'sverker/cerl-rr' into maintSverker Eriksson
* sverker/cerl-rr: erts: Add -rr option to cerl start script
2017-10-16jinterface: Skip tests when hostname cannot be resolvedLukas Larsson
Check that the hostname can be resolved by the native resolver. What normally has happened when it cannot is that gethostname() returned a fqdn and `hostname -s` is not part of /etc/hosts. This is solved on the erlang side by adding `hostname -s` to inet_db, but java does not have a similar mechanism, so it fails when it tries to connect to `hostname -s`. This caused jinterface tests to fail when run in such an environment, and travis-ci recently started doing this.
2017-10-16Merge branch 'ingela/ssl/funtion-name-macro' into maintIngela Anderton Andin
* ingela/ssl/funtion-name-macro: ssl: Use ?FUNCTION_NAME
2017-10-16 ssl: Use ?FUNCTION_NAMEIngela Anderton Andin
Use ?FUNCTION_NAME macro to enhance code as we will not back-port this version of the ssl application to versions pre OTP 19.
2017-10-16Merge branch 'hans/public_key/cuddle_docs' into maintHans Nilsson
2017-10-16public_key: Polish verify_hostname docHans Nilsson
2017-10-16Merge branch 'hans/public_key/ssh2_pubkey_generate_fix/OTP-14570' into maintHans Nilsson
2017-10-13Merge branch 'ingela/ssl/remove-deprcated-string' into maintIngela Anderton Andin
* ingela/ssl/remove-deprcated-string: ssl: Use new string functions
2017-10-12erts: Add -rr option to cerl start scriptSverker Eriksson
to run beam with "rr record".
2017-10-12ssh: Adapt to simplified public_key and simplify sshHans Nilsson
2017-10-12public_key: Remove dead codeHans Nilsson
2017-10-12public_key: Remove extra unused element in internal pubkey_ssh:encode/2Hans Nilsson
2017-10-12Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-10-12ssh: Anonymize unused variables in test suitesHans Nilsson
2017-10-12Revert "Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint"Rickard Green
This reverts commit 0717a2194e863f3a78595184ccc5637697f03353, reversing changes made to 71a40658a0cef8b3e25df3a8e48a72d0563a89bf.
2017-10-12ssh: ssh_bench_SUITE disable aes_gcmHans Nilsson
2017-10-12ssh: remove dead codeHans Nilsson
2017-10-12Merge branch 'hans/public_key/fix_verif_host_ip_addr_bug' into maintHans Nilsson
2017-10-12public_key: Fix bug in pkix_verify_hostname with IP addressesHans Nilsson
An IP address could in some circomstances be converted to a list and then to_lower was applied to it. So {$A,1,1,1} was changed to {$a,1,1,1} which of course didn't match....
2017-10-12Merge branch 'ingela/inets/cgi-env/OTP-14679' into maintIngela Anderton Andin
* ingela/inets/cgi-env/OTP-14679: inets: httpc - fix default timeout in httpc_SUITE inets: ENV should be a string
2017-10-12inets: httpc - fix default timeout in httpc_SUITEIngela Anderton Andin
Timeout must be set in suite/0 or init_per_testcase not init_per_group or init_per_suite
2017-10-12inets: ENV should be a stringIngela Anderton Andin
This is tested by new erts check that will cause badarg when trying to execute scripts via mod_cgi
2017-10-12Merge branch 'lukas/erts/tracing/recv_exit_signal_deadlock/OTP-14678' into maintLukas Larsson
* lukas/erts/tracing/recv_exit_signal_deadlock/OTP-14678: erts: Fix lock order when recv tracing trapped exit signal
2017-10-12Merge branch 'lukas/erts/fix_caller_trace_for_apply_bifs/OTP-14677' into maintLukas Larsson
* lukas/erts/fix_caller_trace_for_apply_bifs/OTP-14677: erts: Fix caller trace for apply bifs
2017-10-12erts: Fix lock order when recv tracing trapped exit signalLukas Larsson
2017-10-11Merge branch 'maint-20' into maintRickard Green
* maint-20: Updated OTP version Update release notes Update version numbers vsn -> 2.1.1 Update appup and code_change for ERIERL-83 Fix missing monitor in diameter_reg
2017-10-10Merge branch 'hans/ssh/ssh_dbg_hostkey/OTP-14658' into maintHans Nilsson
2017-10-10Merge branch 'sverker/fix-code_SUITE-upgrade' into maintSverker Eriksson
2017-10-10Merge branch 'lars/doc-cleanup/OTP-14475' into maintLars Thorsen
* lars/doc-cleanup/OTP-14475: [edoc] Remove unused module otpsgml_layout.erl Remove unused files from the documentation build
2017-10-10Merge branch 'lars/erl_docgen/code-tag-fix/OTP-14674' into maintLars Thorsen
* lars/erl_docgen/code-tag-fix/OTP-14674: [erl_docgen] Fix spacing for code blocks [erl_docgen] Change pdf to have the same style as html for code,warning,note
2017-10-10Merge branch 'lars/orber/fix-man-warnings/OTP-14673' into maintLars Thorsen
* lars/orber/fix-man-warnings/OTP-14673: [orber] Touchup of code tags
2017-10-09Updated OTP versionOTP-20.1.2Erlang/OTP
2017-10-09Update release notesErlang/OTP
2017-10-09Update version numbersErlang/OTP
2017-10-09Merge branch 'sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661' into maint-20Erlang/OTP
* sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661: erts: Fix bug when detecting bad dist message Add distribution_SUITE:bad_dist_ext_size
2017-10-09Merge branch 'anders/diameter/reg_monitor/OTP-14668' into maint-20Erlang/OTP
* anders/diameter/reg_monitor/OTP-14668: vsn -> 2.1.1 Update appup and code_change for ERIERL-83
2017-10-09Merge branch 'anders/diameter/reg_monitor/ERIERL-83' into maint-20Erlang/OTP
* anders/diameter/reg_monitor/ERIERL-83: Fix missing monitor in diameter_reg
2017-10-09[orber] Touchup of code tagsLars Thorsen
2017-10-09ssh: ssh_dbg:algs functionHans Nilsson
2017-10-09Merge branch 'maint' into hans/ssh/ssh_dbg_hostkey/OTP-14658Hans Nilsson
2017-10-09erts: Fix caller trace for apply bifsLukas Larsson
Bifs that are called through the export entry using i_call_last could have their cp set to return_trace, just like any other call. So we have to unwind the trace stack to get the correct cp. Not doing this creates a lot of issues for fprof.
2017-10-09[erl_docgen] Fix spacing for code blocksLars Thorsen
2017-10-06[erl_docgen] Change pdf to have the same style as html for code,warning,noteLars Thorsen
2017-10-05Merge branch 'maint-19' into maintRickard Green
* maint-19: Updated OTP version Update release notes Update version numbers Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/compiler/doc/src/notes.xml lib/compiler/vsn.mk otp_versions.table
2017-10-05Updated OTP versionOTP-19.3.6.3Erlang/OTP
2017-10-05Update release notesErlang/OTP
2017-10-05Update version numbersErlang/OTP
2017-10-05Merge branch 'sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661' into maint-19Erlang/OTP
* sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661: erts: Fix bug when detecting bad dist message Add distribution_SUITE:bad_dist_ext_size