aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-06-07eldap: Prevent test to fail at end if ssl is not availableHans Nilsson
2017-06-07Merge branch 'ingela/inets/ERL-382'Ingela Anderton Andin
* ingela/inets/ERL-382: inets: httpc - Gracefull normal shutdown
2017-06-07Merge branch 'ingela/dtls/retransmisssion-timers'Ingela Anderton Andin
* ingela/dtls/retransmisssion-timers: dtls: Fetch next DTLS record when dropping resent handshake data dtls: Use enter actions
2017-06-07Merge branch 'lukas/erts/sendfile_sunos_fix/OTP-14424'Lukas Larsson
* lukas/erts/sendfile_sunos_fix/OTP-14424: erts: Fix sendfile closeduring scenario on sunos
2017-06-07Merge branch 'dgud/observer/edit-pid-port-ref'Dan Gudmundsson
* dgud/observer/edit-pid-port-ref: observer: Allow edit of pid, port and refs
2017-06-07Merge branch 'dgud/fix-unicode-atom'Dan Gudmundsson
* dgud/fix-unicode-atom: mnesia: Print tables with ~ts to support unicode atoms
2017-06-07erts: Fix sendfile closeduring scenario on sunosLukas Larsson
On Solaris, giving a too long sfv_len results in an EINVAL error, but data is still transmitted and len is correctly. So we translate this to a success with that amount of data sent. This may hide some other errors that causes EINVAL, but it is the best we can do for now.
2017-06-07dtls: Fetch next DTLS record when dropping resent handshake dataIngela Anderton Andin
2017-06-07dtls: Use enter actionsIngela Anderton Andin
Using enter actions for retransmission timers makes the code easier to understand. Previously the retransmission timer was incorrectly started in the connection state. Using enter actions feels like a cleaner approach than bloating the state with more flags.
2017-06-05Merge branch 'lukas/erts/20_minor_fixes'Lukas Larsson
* lukas/erts/20_minor_fixes: kernel: Iterate for correct time in os_SUITE:perf_counter
2017-06-05Merge branch 'maint'Lars Thorsen
Conflicts: OTP_VERSION erts/vsn.mk
2017-06-05Merge commit '13b3ff0f9b45e61c071ddbec2ce45345fddecefe'Lars Thorsen
2017-06-05Merge branch 'maint-19' into maintLars Thorsen
2017-06-02kernel: Iterate for correct time in os_SUITE:perf_counterLukas Larsson
2017-06-02Merge branch 'lukas/erts/hipe_mkliterals_libs/ERIERL-14/OTP-14447'Lukas Larsson
* lukas/erts/hipe_mkliterals_libs/ERIERL-14/OTP-14447: hipe: Fix hipe_mkliterals make recipe
2017-06-02Merge pull request #1473 from SalikhovDinislam/static_codeLukas Larsson
Make some C code static
2017-06-02Merge pull request #1472 from SalikhovDinislam/dead_codeLukas Larsson
erts: Remove unused functions from erl_cpu_topology
2017-06-02Merge pull request #1471 from gomoripeti/fix_erl_tracer_exampleLukas Larsson
Update erl_msg_tracer example
2017-06-02Merge branch 'hans/ssh/dbg_fixes'Hans Nilsson
2017-06-02ssh: Restructure internal tool ssh_dbgHans Nilsson
The need for more trace patterns requires a somewhat different structure. It was previoiusly a bit difficult to use in e.g. test suites. Now it is easier.
2017-06-02ssh: Removed out-commented codeHans Nilsson
2017-06-02Updated OTP versionOTP-19.3.5Erlang/OTP
2017-06-02Update release notesErlang/OTP
2017-06-02Update version numbersErlang/OTP
2017-06-02Merge branch 'lars/xmerl/fragmented-xml-directive/OTP-14430' into maint-19Erlang/OTP
* lars/xmerl/fragmented-xml-directive/OTP-14430: [xmerl] Update version [xmerl] Add test cases [xmerl] Fix endDocument bug in output backends [xmerl] Fix fragmented xml directive bug and replace ets table
2017-06-02Merge branch 'lukas/erts/restore-sigterm-default/OTP-14418' into maint-19Erlang/OTP
* lukas/erts/restore-sigterm-default/OTP-14418: erts: Add undocumented option to do default SIGTERM
2017-06-02Merge branch 'john/erts/lcnt-table-name/ERIERL-22/OTP-14442'John Högberg
2017-06-02Merge branch 'john/erts/refactor-gcsuite'John Högberg
2017-06-02Merge pull request #1479 from weisslj/fix-missing-ssl-closeIngela Andin
Correct close semantics for active once connections. This was a timing dependent bug the resulted in the close message not always reaching the ssl user process. OTP-14443
2017-06-01Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
2017-05-31ssh: more keys for testingHans Nilsson
2017-05-31ssh: Introduce test case simple_connect in ssh_algorithms_SUITEHans Nilsson
In the test group public_key we need to control both the host key and the user key. This new test case is aimed at faciliate the user public key testing.
2017-05-31ssh: Use option 'pref_public_key_algs' in ssh_algorithms_SUITEHans Nilsson
2017-05-31ssh: Change printouts for ssh_dbg:auth()Hans Nilsson
This reverts commit 4ee80fd8738393bf581e0393416befda1ca621b6.
2017-05-31ssh: ssh_options checks 'pref_public_key_algs' for dubbletsHans Nilsson
2017-05-31ssh: Improve 'server-sig-algs' handling in clientHans Nilsson
2017-05-31Revert "Updated OTP version"Hans Nilsson
This reverts commit a6db7427e7d760b1a57a9d35932898ec265977a2. Conflicts: OTP_VERSION
2017-05-31Revert "Prepare release"Hans Nilsson
This reverts commit eaf8ca41dfa4850437ad270d3897399c9358ced0.
2017-05-31Updated OTP_VERSION for Release CandidateOTP-20.0-rc2Hans Nilsson
2017-05-31Break out a lot of duplicated code in minor_major_gc_option_ZZZJohn Högberg
2017-05-31Fix a race condition that consistently affected lc+lcnt buildsJohn Högberg
The garbage_collect message could be received while waiting for trace messages, causing the test to crash erroneously.
2017-05-31observer: Allow edit of pid, port and refsDan Gudmundsson
Use lib:extended_parse_term/1 to allow editing terms which contains pids, ports and terms. ERL-178
2017-05-31mnesia: Print tables with ~ts to support unicode atomsDan Gudmundsson
2017-05-30Better fix for non-delivery of ssl_closed message in active onceIngela Andin
This is taken from https://github.com/erlang/otp/pull/1479#issuecomment-304667528 with permission from Ingela Andin and improves commit 8abe16c22d.
2017-05-30Updated OTP versionErlang/OTP
2017-05-30Prepare releaseErlang/OTP
2017-05-30inets: httpc - Gracefull normal shutdownIngela Anderton Andin
2017-05-29Merge branch 'rickard/sys-proc-off-heap-msgq'Rickard Green
OTP-14438 * rickard/sys-proc-off-heap-msgq: Enable off-heap message queue for code purger, et. al.
2017-05-29Enable off-heap message queue for code purger, et. al.Rickard Green
2017-05-29Merge branch 'bjorn/erts/fix-sys-task-cleanup'Björn Gustavsson
* bjorn/erts/fix-sys-task-cleanup: erl_process.c: Add more assertions in process termination Make sure that asynchronous replies are not lost