summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-21.1Erlang/OTP2018-09-242-1/+2
* Prepare releaseErlang/OTP2018-09-2475-45/+1316
* Merge branch 'ingela/ftp/tftp/app.src-fix' into maintIngela Anderton Andin2018-09-242-2/+2
|\
| * ftp, tftp: Version should not be hardcoded in <app>.app.srcIngela Anderton Andin2018-09-242-2/+2
* | Merge branch 'hans/crypto/fix_bad_merge' into maintHans Nilsson2018-09-211-13/+6
|\ \ | |/
| * crypto: Fix accidental mergeHans Nilsson2018-09-211-13/+6
|/
* Update copyright yearHenrik Nord2018-09-21108-108/+108
* Merge branch 'ingela/ssl/openssl-test-interop' into maintIngela Anderton Andin2018-09-202-85/+116
|\
| * ssl: Improve interop checksIngela Anderton Andin2018-09-202-85/+116
* | Merge branch 'maint-19' into maintSverker Eriksson2018-09-202-0/+17
|\ \ | |/ |/|
| * Updated OTP versionOTP-19.3.6.11Erlang/OTP2018-09-192-1/+2
| * Update release notesErlang/OTP2018-09-191-0/+16
| * Update version numbersErlang/OTP2018-09-191-1/+1
| * Merge branch 'sverker/erts/19/memory-leak-terminating-port/OTP-14609' into ma...Erlang/OTP2018-09-191-3/+6
| |\
| | * erts: Fix memory leak when sending to terminating portSverker Eriksson2018-09-191-3/+6
| |/
* | Merge branch 'ingela/ERL-622/fix' into maintIngela Anderton Andin2018-09-202-2/+3
|\ \
| * | ssl: Move link to correct processIngela Anderton Andin2018-09-202-2/+3
* | | Merge branch 'raimo/receive-TOS-TCLASS/ERIERL-187/OTP-15145' into maintRaimo Niskanen2018-09-194-56/+135
|\ \ \
| * | | Elaborate the disclaimer for 'pktoptions'Raimo Niskanen2018-09-191-1/+13
| * | | Improve platform filterRaimo Niskanen2018-09-192-11/+35
| * | | Fix endianness bug for CMSG parsingRaimo Niskanen2018-09-191-44/+87
* | | | Merge branch 'hans/crypto/cuddle_docs' into maintHans Nilsson2018-09-193-42/+178
|\ \ \ \
| * | | | crypto: Re-work the 'Description' sectionHans Nilsson2018-09-191-35/+144
| * | | | crypto: Add warnings in RefMan and User's Guide for experimental RSA optsHans Nilsson2018-09-183-7/+34
|/ / / /
* | | | Merge branch 'maint-20' into maintJohn Högberg2018-09-182-0/+17
|\ \ \ \
| * | | | Updated OTP versionOTP-20.3.8.9Erlang/OTP2018-09-112-1/+2
| * | | | Update release notesErlang/OTP2018-09-111-0/+16
| * | | | Update version numbersErlang/OTP2018-09-111-1/+1
| * | | | Merge branch 'john/compiler/fix-rebar-recompiles-maint-20/OTP-15292' into mai...Erlang/OTP2018-09-111-1/+0
| |\ \ \ \
| | * | | | Fix include-path regression caused by dd0a39cJohn Högberg2018-09-101-1/+0
| |/ / / /
* | | | | Merge branch 'sverker/erts/robustify-dist-entry-states/OTP-15297' into maintSverker Eriksson2018-09-1812-319/+262
|\ \ \ \ \
| * \ \ \ \ Merge 'sverker/erts/fix-aborted-pending-connection-race/OTP-15296'Sverker Eriksson2018-09-183-48/+55
| |\ \ \ \ \
| * | | | | | erts: Refactor port dist_entry & conn_id into PRTSDSverker Eriksson2018-09-185-30/+40
| * | | | | | Remove ugly fail case macrosSverker Eriksson2018-09-181-22/+11
| * | | | | | Consolidate distribution entry state transitionsSverker Eriksson2018-09-1812-271/+211
| * | | | | | erts: Fix bug in undocumented system_flag(scheduling_statistics)Sverker Eriksson2018-09-111-1/+4
* | | | | | | Merge branch 'siri/cuddle' into maintSiri Hansen2018-09-183-14/+27
|\ \ \ \ \ \ \
| * | | | | | | [logger] Skip app level test if app cannot be loadedSiri Hansen2018-09-171-14/+19
| * | | | | | | Terminate nodes after failed test cases in erl_distribution_SUITESiri Hansen2018-09-171-0/+1
| * | | | | | | Skip performance test on build types other than 'opt'Siri Hansen2018-09-171-0/+7
* | | | | | | | Merge branch 'hasse/stdlib/binary_in_format/OTP-15304' into maintHans Bolinder2018-09-181-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | stdlib: Allow lists with binaries in the Format argumentHans Bolinder2018-09-171-1/+2
* | | | | | | | | Merge pull request #1956 from erlang/sverker-ets-patch-1Sverker Eriksson2018-09-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test ets doc updatesverker-ets-patch-1Sverker Eriksson2018-09-171-1/+1
* | | | | | | | | | Merge branch 'hans/crypto/chacha_poly_into_aead_fns/OTP-15300' into maintHans Nilsson2018-09-182-183/+82
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | crypto: Fix bad return/exception for unsupported cipherHans Nilsson2018-09-181-57/+59
| * | | | | | | | | | crypto: Use aead functions for CHACHA20_POLY1305Hans Nilsson2018-09-182-143/+40
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'hans/crypto/disable_rsa_sslv23_libressl/OTP-15303' into maintHans Nilsson2018-09-181-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | crypto: Disable problematic RSA options in LibreSSLHans Nilsson2018-09-181-2/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'hans/crypto/revert_bad_tests' into maintHans Nilsson2018-09-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |