aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-08-20Merge branch 'maint'Rickard Green
* maint: erts/time_correction.xml: remove extra closing parenthesis use ssl:handshake/1 function
2018-08-20Merge pull request #1934 from marianoguerra/fix-extra-closing-parenthesisRickard Green
erts/time_correction.xml: remove extra closing parenthesis
2018-08-20Merge pull request #1901 from getong/fix_ssl_exampleIngela Andin
Modernized example
2018-08-17Merge branch 'maint'Hans Nilsson
* maint: ssh: Use the 'macs' tag in crypto:supports/0 ssh: Use the new crypto:supports/0 tag 'curves' crypto: Try to generate ecdh for all crypto:curves() crypto: Put curve list in C
2018-08-17Merge branch 'hans/ssh/curve_element/OTP-15244' into maintHans Nilsson
* hans/ssh/curve_element/OTP-15244: ssh: Use the 'macs' tag in crypto:supports/0 ssh: Use the new crypto:supports/0 tag 'curves'
2018-08-17Merge branch 'hans/crypto/curve_in_supports/OTP-14717' into maintHans Nilsson
* hans/crypto/curve_in_supports/OTP-14717: crypto: Try to generate ecdh for all crypto:curves() crypto: Put curve list in C
2018-08-16erts/time_correction.xml: remove extra closing parenthesisMariano Guerra
2018-08-16ssh: Use the 'macs' tag in crypto:supports/0Hans Nilsson
2018-08-16ssh: Use the new crypto:supports/0 tag 'curves'Hans Nilsson
2018-08-16crypto: Try to generate ecdh for all crypto:curves()Hans Nilsson
2018-08-16crypto: Put curve list in CHans Nilsson
2018-08-16Merge branch 'maint'Hans Nilsson
* maint: crypto: Fail tests if crypto cannot start
2018-08-16Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Fail tests if crypto cannot start
2018-08-16Merge branch 'maint'Hans Nilsson
* maint: ssh: prolong the timeout in ssh_dbg gen_server calls
2018-08-16Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2018-08-16Merge remote-tracking branch 'upstream/maint'Dan Gudmundsson
* upstream/maint: Require align Add Erlang alignment regexps
2018-08-16Merge pull request #1728 from davidw/emacs-alignDan Gudmundsson
OTP-15239
2018-08-16Merge branch 'josevalim/jv-sb/PR-1803/OTP-15238' into masterLukas Larsson
Optimize binary match from 10% up to 70x
2018-08-16Merge branch 'maint'Lukas Larsson
2018-08-16Merge pull request #1931 from marianoguerra/fix-doc-errors-maintLukas Larsson
fix double parenthesis and badly formatter <v> tags
2018-08-16Merge pull request #1930 from ↵Lukas Larsson
marianoguerra/fix-emd2exml-encoding-value-gen-maint fix generated encoding for xml files generated with emd2exml
2018-08-15fix double parenthesis and badly formatter <v> tagsMariano Guerra
(cherry picked from commit 1b36c8ff81e896f9aa172603962f838d980668a0)
2018-08-15fix generated encoding for xml files generated with emd2exmlMariano Guerra
DTRACE.xml and SYSTEMTRAP.xml set encoding to utf8 instead of utf-8 and make xmerl_scan:file/1,2 fail parsing them (cherry picked from commit faded6e1cdceb049d2d9bc995b6c981d58709315)
2018-08-15ssh: prolong the timeout in ssh_dbg gen_server callsHans Nilsson
2018-08-15crypto: Fail tests if crypto cannot startHans Nilsson
2018-08-15Merge branch 'maint'Björn Gustavsson
* maint: Fix compiler crash when compiling double receives erts: Delete fd from poll-set when closing fd_driver port
2018-08-15Merge pull request #1927 from ↵Björn Gustavsson
bjorng/bjorn/compiler/double-receives/ERL-703/OTP-15235 Fix compiler crash when compiling double receives
2018-08-15merge branch 'lukas/erts/fd_driver-fix_pollset_delete/ERL-692/OTP-15236' ↵Lukas Larsson
into maint erts: Delete fd from poll-set when closing fd_driver port
2018-08-15Merge branch 'maint'Ingela Anderton Andin
2018-08-15Merge branch 'maint-20' into maintIngela Anderton Andin
* maint-20: inets: Remove 21 test case Updated OTP version Update release notes Conflicts: OTP_VERSION lib/inets/doc/src/notes.xml lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk otp_versions.table
2018-08-15inets: Remove 21 test caseIngela Anderton Andin
A test case unrelated to the patch was accidentally added when backporting the solution.
2018-08-15Merge branch 'maint'Lukas Larsson
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
* lukas/travis/deploy: travis: Make bundle version select regexp stricter
2018-08-15travis: Make bundle version select regexp stricterLukas Larsson
2018-08-15Merge branch 'maint'Ingela Anderton Andin
2018-08-15Merge branch 'ingela/inets/status-501/ERIERL-218/OTP-15215' into maintIngela Anderton Andin
* ingela/inets/status-501/ERIERL-218/OTP-15215: inets: Use status code 501 when no mod_* handles the request
2018-08-15Merge branch 'maint'Lukas Larsson
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
* lukas/travis/deploy: travis: Filter out release candidates from bundle tags
2018-08-15travis: Filter out release candidates from bundle tagsLukas Larsson
2018-08-15lukas/kernel/logger_set_app_lvl/PR-1843/OTP-15146Lukas Larsson
Add logger:set_application_level/2
2018-08-15Merge pull request #1928 from bettio/fix-remove_message_docBjörn Gustavsson
remove_message does not store any pointer to x0
2018-08-14Updated OTP versionOTP-20.3.8.6Erlang/OTP
2018-08-14Update release notesErlang/OTP
2018-08-14Merge branch 'ingela/inets/maint-20/status-501/ERIERL-218/OTP-15215' into ↵Erlang/OTP
maint-20 * ingela/inets/maint-20/status-501/ERIERL-218/OTP-15215: inets: Prepare for release inets: Use status code 501 when no mod_* handles the request # Conflicts: # lib/inets/test/httpd_SUITE.erl # lib/inets/vsn.mk
2018-08-14Merge branch 'maint'Ingela Anderton Andin
2018-08-14Merge branch 'ingela/inets/maint-20/status-501/ERIERL-218/OTP-15215' into maintIngela Anderton Andin
2018-08-14remove_message does not store any pointer to x0Davide Bettio
remove_message just remove messages without writing to any register. Compiler is already generating code like: {get_tuple_element,{x,0},1,{x,0}}. remove_message. {jump,{f,6}} That clearly uses x0 for other purposes.
2018-08-14inets: Prepare for releaseIngela Anderton Andin
2018-08-14Fix compiler crash when compiling double receivesBjörn Gustavsson
The compiler would crash when compiling a function with two receive statements. https://bugs.erlang.org/browse/ERL-703
2018-08-14inets: Use status code 501 when no mod_* handles the requestIngela Anderton Andin
Conflicts: lib/inets/test/httpd_SUITE.erl
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 23:04:46 +0000