summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bjorn/observer/fix-crashdump_viewer/ERL-722/OTP-15365' into maintBjörn Gustavsson2018-10-242-42/+134
|\
| * Eliminate crash in crashdump_viewer reading some literal mapsBjörn Gustavsson2018-10-222-42/+134
* | Merge pull request #1991 from bjorng/bjorn/erts/fix-max_heap_size/OTP-15360Björn Gustavsson2018-10-243-2/+58
|\ \
| * | Honor the max heap size when copying literals after purgingBjörn Gustavsson2018-10-193-2/+58
* | | Merge pull request #1992 from bjorng/bjorn/stdlib/beam_lib/ERL-696Björn Gustavsson2018-10-243-4/+4
|\ \ \
| * | | beam_lib: Remove obsolete module() from the beam() typeBjörn Gustavsson2018-10-192-3/+3
| * | | hipe: Don't use beam_lib:info/1 with an atom as filenameBjörn Gustavsson2018-10-191-1/+1
* | | | Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson2018-10-242-5/+12
|\ \ \ \
| * | | | crypto: Fix tests failing if more than one test engine availableHans Nilsson2018-10-241-1/+1
| * | | | crypto: Disable engine tests on Darwin and WindowsHans Nilsson2018-10-241-4/+11
|/ / / /
* | | | Merge branch 'hans/ssh/document_user/OTP-15314' into maintHans Nilsson2018-10-2411-67/+520
|\ \ \ \
| * | | | ssh: Re-phrase and adjust the documentation (ssh_file.xml)Hans Nilsson2018-10-242-67/+72
| * | | | ssh: Move some option's documentation to ssh_fileHans Nilsson2018-10-247-113/+131
| * | | | ssh: Clearify a couple of optionsHans Nilsson2018-10-241-1/+20
| * | | | ssh: Links updated in ssh.xmlHans Nilsson2018-10-241-6/+14
| * | | | ssh: Add reference manual page for the ssh_file moduleHans Nilsson2018-10-244-0/+217
| * | | | ssh: Add new User's Guide chapter about SSH terminologyHans Nilsson2018-10-243-1/+187
|/ / / /
* | | | Merge branch 'rickard/development_runtime_dependency/OTP-15341' into maintRickard Green2018-10-233-4/+124
|\ \ \ \
| * | | | Fixup development runtime dependenciesRickard Green2018-10-233-4/+124
* | | | | Update version info for internal patch merge scriptsRickard Green2018-10-231-1/+1
* | | | | Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maintIngela Anderton Andin2018-10-230-0/+0
|\ \ \ \ \
| * | | | | public_key: Add DSA with SHA2 supportIngela Anderton Andin2018-10-193-1/+21
* | | | | | Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maintIngela Anderton Andin2018-10-233-1/+21
|\ \ \ \ \ \
| * | | | | | public_key: Add DSA with SHA2 supportIngela Anderton Andin2018-10-233-1/+21
|/ / / / / /
* | | | | | Merge branch 'ingela/ssl/use-correct-len-aead' into maintIngela Anderton Andin2018-10-231-1/+1
|\ \ \ \ \ \
| * | | | | | ssl: Correct length to be used in additional data in CHACHA20_POLY1305 cipherIngela Anderton Andin2018-10-231-1/+1
* | | | | | | Update version info for internal patch merge scriptsRickard Green2018-10-221-1/+1
* | | | | | | Merge branch 'raimo/tcp-close-while-send/maint/ERL-561/OTP-12242' into maintRaimo Niskanen2018-10-223-29/+260
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Write test caseRaimo Niskanen2018-10-191-2/+144
| * | | | | | Fix hanging gen_tcp send vs close raceRaimo Niskanen2018-10-192-27/+116
| |/ / / / /
* | | | | | Merge branch 'ingela/ssl/aead-refactor' into maintIngela Anderton Andin2018-10-225-99/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | ssl: Refactor AEAD ciphersIngela Anderton Andin2018-10-195-99/+117
* | | | | | Add version info for internal patch merge scriptsRickard Green2018-10-211-0/+1
* | | | | | Merge branch 'maint-19' into maintHans Nilsson2018-10-192-0/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Updated OTP versionOTP-19.3.6.12Erlang/OTP2018-10-182-1/+2
| * | | | | Prepare releaseErlang/OTP2018-10-183-1/+18
| * | | | | Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into mai...Erlang/OTP2018-10-181-3/+12
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #1975 from sirihansen/siri/logger/config-set-or-updateSiri Hansen2018-10-1912-185/+651
|\ \ \ \ \ \ \
| * | | | | | | [logger] Add handler callback filter_config/1Siri Hansen2018-10-038-6/+86
| * | | | | | | [logger] Start using handler callback changing_config/3 in built-in handlersSiri Hansen2018-10-038-147/+414
| * | | | | | | [logger] Add update_handler_config/3Siri Hansen2018-10-034-9/+90
| * | | | | | | [logger] Add SetOrUpdate parameter to handler callback changing_configSiri Hansen2018-09-203-29/+67
* | | | | | | | Merge branch 'siri/cuddle' into maintSiri Hansen2018-10-192-3/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix gen_fsm_SUITE:start2/1 to terminate process synchronouslySiri Hansen2018-10-161-0/+2
| * | | | | | | Fix sys_SUITE:special_process/1 to terminating process synchronouslySiri Hansen2018-10-161-3/+14
* | | | | | | | Merge branch 'maint-20' into maintHans Nilsson2018-10-184-2/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Updated OTP versionOTP-20.3.8.10Erlang/OTP2018-10-162-1/+2
| * | | | | | | Prepare releaseErlang/OTP2018-10-165-2/+38
| * | | | | | | Merge branch 'sverker/erts/ets-select_replace-bug/OTP-15346' into maint-20Erlang/OTP2018-10-162-11/+23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'hans/eldap/prevent_EXIT_at_close/OTP-15342/ERIERL-242' into mai...Erlang/OTP2018-10-161-3/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
View Lorry Controller Status