aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-11-01Merge branch 'maint-20' into maintRickard Green
* maint-20: Updated OTP version Prepare release
2018-11-01Merge branch 'rickard/internal_ref_cmp/OTP-15399/ERL-751' into maintRickard Green
* rickard/internal_ref_cmp/OTP-15399/ERL-751: Fix erts_internal_ref_number_cmp()
2018-10-31Updated OTP versionOTP-20.3.8.11Erlang/OTP
2018-10-31Prepare releaseErlang/OTP
2018-10-31Merge branch 'rickard/internal_ref_cmp/OTP-15399/ERL-751' into maint-20Erlang/OTP
* rickard/internal_ref_cmp/OTP-15399/ERL-751: Fix erts_internal_ref_number_cmp()
2018-10-31Fix erts_internal_ref_number_cmp()Rickard Green
2018-10-30Merge pull request #2007 from isadd/patch-1Henrik Nord
Update profiling.xml
2018-10-30Merge pull request #2010 from c-bik/patch-3Hans Nilsson
fix extra parameter in <type>
2018-10-30Merge pull request #1999 from elbrujohalcon/patch-4Hans Bolinder
Fix docs on gen_event optional callback
2018-10-29fix extra parameter in <type>Bikram Chatterjee
```erlang Position = integer() ``` Parameter doesn't exist in `read/3,4`
2018-10-29Merge branch 'hans/ssh/convert_to_proper/OTP-15312' into maintHans Nilsson
* hans/ssh/convert_to_proper/OTP-15312: ssh: Enable property_test/ssh_eqc_client_server for PropEr ssh: Used fixed localhost address ssh: Fix reporting functions in property_test/ssh_eqc_client_server.erl ssh: Fix property_test/ssh_eqc_client_info_timing.erl
2018-10-29ssh: Enable property_test/ssh_eqc_client_server for PropErHans Nilsson
PropEr does not support the grouped statem-tests. This commits calls the grouped functions from the functions supported by PropEr. Optimized with memoization. Previously only EQC was supported, but the changes to support PROPER is not just a wrapper. Since I don't have access to eqc I can't test the changes and therefore eqc is disabeled. However, with access to eqc it ought to be quite easy to re-enable eqc by studying the diff.
2018-10-29ssh: Used fixed localhost addressHans Nilsson
Problem on Darwin, Solaris and FreeBSD with local addresses in 127.1.0.0/8
2018-10-29ssh: Fix reporting functions in property_test/ssh_eqc_client_server.erlHans Nilsson
2018-10-29ssh: Fix property_test/ssh_eqc_client_info_timing.erlHans Nilsson
Had problems on Darwin, Solaris and FreeBSD.
2018-10-29Merge branch 'maint-18' into maintRickard Green
* maint-18: Updated OTP version Prepare release
2018-10-29Merge pull request #1977 from RogierWV/maint/OTP-15389Lukas Larsson
Fix run_erl.c so it compiles on Solaris
2018-10-29Merge pull request #1983 from binaryseed/bug-default-address_please/OTP-15388Lukas Larsson
Fix the default implementation of address_please
2018-10-29Merge branch 'jimdigriz/os_mon/fix_cpu_sup_android/OTP-15387' into maintLukas Larsson
* jimdigriz/os_mon/fix_cpu_sup_android/OTP-15387: Make Erlang's cpu_sup function better on Android SELinux is another cause of MSG_CTRUNC
2018-10-26Updated OTP versionOTP-18.3.4.10Erlang/OTP
2018-10-26Prepare releaseErlang/OTP
2018-10-26Merge branch 'sverker/erts/18/memory-leak-terminating-port/OTP-14609' into ↵Erlang/OTP
maint-18 * sverker/erts/18/memory-leak-terminating-port/OTP-14609: erts: Fix memory leak when sending to terminating port
2018-10-26Update profiling.xmlxbofang
memory typo
2018-10-24Fix docs on gen_event optional callbackBrujo Benavides
It returns `ok`, instead of `noreply`.
2018-10-24Merge branch 'bjorn/observer/fix-crashdump_viewer/ERL-722/OTP-15365' into maintBjörn Gustavsson
* bjorn/observer/fix-crashdump_viewer/ERL-722/OTP-15365: Eliminate crash in crashdump_viewer reading some literal maps
2018-10-24Merge pull request #1991 from bjorng/bjorn/erts/fix-max_heap_size/OTP-15360Björn Gustavsson
Honor the max heap size when copying literals after purging
2018-10-24Merge pull request #1992 from bjorng/bjorn/stdlib/beam_lib/ERL-696Björn Gustavsson
beam_lib: Clarify the beam() type in code and documentation OTP-15378
2018-10-24Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Fix tests failing if more than one test engine available This could happen in an Valgrind run: crypto: Disable engine tests on Darwin and Windows Does not work.
2018-10-24crypto: Fix tests failing if more than one test engine availableHans Nilsson
This could happen in an Valgrind run: === Reason: no case clause matching ["otp_test_engine.so", "otp_test_engine.valgrind.so"] in function crypto:check_otp_test_engine/1 (crypto.erl, line 2026) in call from engine_SUITE:engine_load_all_methods/1 (engine_SUITE.erl, line 154)
2018-10-24crypto: Disable engine tests on Darwin and WindowsHans Nilsson
Does not work.
2018-10-24Merge branch 'hans/ssh/document_user/OTP-15314' into maintHans Nilsson
* hans/ssh/document_user/OTP-15314: ssh: Re-phrase and adjust the documentation (ssh_file.xml) ssh: Move some option's documentation to ssh_file user_dir user_dir_fun (missing previously) *_passphrase system_dir ssh: Clearify a couple of options user_dir, system_dir and *_passphrase are only used in the default callback module ssh_file ssh: Links updated in ssh.xml ssh: Add reference manual page for the ssh_file module ssh: Add new User's Guide chapter about SSH terminology The term "user" means different things in OpenSSH and in Erlang/SSH. This new chapter explains why.
2018-10-24ssh: Re-phrase and adjust the documentation (ssh_file.xml)Hans Nilsson
2018-10-24ssh: Move some option's documentation to ssh_fileHans Nilsson
user_dir user_dir_fun (missing previously) *_passphrase system_dir
2018-10-24ssh: Clearify a couple of optionsHans Nilsson
user_dir, system_dir and *_passphrase are only used in the default callback module ssh_file
2018-10-24ssh: Links updated in ssh.xmlHans Nilsson
2018-10-24ssh: Add reference manual page for the ssh_file moduleHans Nilsson
This callback module has the knowledge about the different files used by Erlang/OTP SSH. It was unfortunatly not documented previously.
2018-10-24ssh: Add new User's Guide chapter about SSH terminologyHans Nilsson
The term "user" means different things in OpenSSH and in Erlang/SSH. This new chapter explains why.
2018-10-23Merge branch 'rickard/development_runtime_dependency/OTP-15341' into maintRickard Green
* rickard/development_runtime_dependency/OTP-15341: Fixup development runtime dependencies
2018-10-23Fixup development runtime dependenciesRickard Green
The script 'make/fixup_development_runtime_dependencies' is run at the end of a build of development branches in order to fixup future not yet resolved versions (<app name>-@<ticket>(:<ticket>)+@) in 'runtime_dependencies'.
2018-10-23Update version info for internal patch merge scriptsRickard Green
2018-10-23Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maintIngela Anderton Andin
* ingela/public_key/DSA-SHA2/OTP-15367: public_key: Add DSA with SHA2 support
2018-10-23Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maintIngela Anderton Andin
* ingela/public_key/DSA-SHA2/OTP-15367: public_key: Add DSA with SHA2 support
2018-10-23public_key: Add DSA with SHA2 supportIngela Anderton Andin
2018-10-23Merge branch 'ingela/ssl/use-correct-len-aead' into maintIngela Anderton Andin
* ingela/ssl/use-correct-len-aead: ssl: Correct length to be used in additional data in CHACHA20_POLY1305 cipher
2018-10-23ssl: Correct length to be used in additional data in CHACHA20_POLY1305 cipherIngela Anderton Andin
2018-10-22Update version info for internal patch merge scriptsRickard Green
2018-10-22Merge branch 'raimo/tcp-close-while-send/maint/ERL-561/OTP-12242' into maintRaimo Niskanen
* raimo/tcp-close-while-send/maint/ERL-561/OTP-12242: Write test case Fix hanging gen_tcp send vs close race Conflicts: erts/preloaded/ebin/prim_inet.beam
2018-10-22Merge branch 'ingela/ssl/aead-refactor' into maintIngela Anderton Andin
* ingela/ssl/aead-refactor: ssl: Refactor AEAD ciphers
2018-10-22Eliminate crash in crashdump_viewer reading some literal mapsBjörn Gustavsson
Literal maps with complex keys such as: #{"one"=>1,"two"=>2,"three"=>3,"four"=>4}. would produce a crash dump that `crashdump_viewer` was unable to read. https://bugs.erlang.org/browse/ERL-722
2018-10-21Add version info for internal patch merge scriptsRickard Green