aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-08-21Merge branch 'rickard/crypto-configure/OTP-15129'Rickard Green
2018-08-21Merge branch 'rickard/parallel-configure/OTP-14625'Rickard Green
2018-08-21Move configuration of crypto to crypto application from ertsRickard Green
2018-08-21Parallel configureRickard Green
2018-08-21Merge branch 'max-au/dist_msg_too_long'Rickard Green
2018-08-21Cleanup unused dist output buf immediately instead of at GCRickard Green
2018-08-21Merge branch 'maint'Hans Bolinder
2018-08-21Merge branch 'hasse/stdlib/io_lib_errhandling/OTP-15076' into maintHans Bolinder
2018-08-21Merge branch 'maint'Rickard Green
2018-08-21Merge branch 'rickard/fix-suspend-monitor-down/OTP-15237/ERL-704' into maintRickard Green
2018-08-20Merge branch 'maint'Rickard Green
2018-08-20Merge pull request #1934 from marianoguerra/fix-extra-closing-parenthesisRickard Green
2018-08-20stdlib: Correct contracts in module io_lib_formatHans Bolinder
2018-08-20stdlib: Improve error handling in module io_libHans Bolinder
2018-08-20Fix incoming suspend monitor downRickard Green
2018-08-20Merge pull request #1901 from getong/fix_ssl_exampleIngela Andin
2018-08-17Merge branch 'maint'Hans Nilsson
2018-08-17Merge branch 'hans/ssh/curve_element/OTP-15244' into maintHans Nilsson
2018-08-17Merge branch 'hans/crypto/curve_in_supports/OTP-14717' into maintHans Nilsson
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
2018-08-16Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
2018-08-16Merge branch 'maint'Hans Nilsson
2018-08-16Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2018-08-16Merge remote-tracking branch 'upstream/maint'Dan Gudmundsson
2018-08-16Merge pull request #1728 from davidw/emacs-alignDan Gudmundsson
2018-08-16Merge branch 'josevalim/jv-sb/PR-1803/OTP-15238' into masterLukas Larsson
2018-08-16Merge branch 'maint'Lukas Larsson
2018-08-16Merge pull request #1931 from marianoguerra/fix-doc-errors-maintLukas Larsson
2018-08-16Merge pull request #1930 from marianoguerra/fix-emd2exml-encoding-value-gen-m...Lukas Larsson
2018-08-15fix double parenthesis and badly formatter <v> tagsMariano Guerra
2018-08-15fix generated encoding for xml files generated with emd2exmlMariano Guerra
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
2018-08-15Merge pull request #1927 from bjorng/bjorn/compiler/double-receives/ERL-703/O...Björn Gustavsson
2018-08-15merge branch 'lukas/erts/fd_driver-fix_pollset_delete/ERL-692/OTP-15236' into...Lukas Larsson
2018-08-15Merge branch 'maint'Ingela Anderton Andin
2018-08-15Merge branch 'maint-20' into maintIngela Anderton Andin
2018-08-15inets: Remove 21 test caseIngela Anderton Andin
2018-08-15Merge branch 'maint'Lukas Larsson
2018-08-15Merge branch 'lukas/travis/deploy' into maintLukas Larsson
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
2018-08-15Merge branch 'maint'Lukas Larsson