aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-12-03Merge branch 'maint'Sverker Eriksson
2018-12-03Merge branch 'sverker/erts/cuddle-driver_SUITE' into maintSverker Eriksson
* sverker/erts/cuddle-driver_SUITE: erts: Fix faulty assert in driver_SUITE erts: Improve driver_SUITE:smp_select
2018-12-03Merge branch 'maint'Siri Hansen
2018-12-03Merge branch 'siri/logger/std-recreate-file-if-rotated/OTP-15469' into maintSiri Hansen
* siri/logger/std-recreate-file-if-rotated/OTP-15469: [logger] Re-create log file if deleted
2018-12-03Merge branch 'maint'Siri Hansen
2018-12-03Merge branch 'siri/logger/unexpected-exit-from-simple/ERL-788/OTP-15466' ↵Siri Hansen
into maint * siri/logger/unexpected-exit-from-simple/ERL-788/OTP-15466: [logger] Unlink simple handler before terminating
2018-12-03Merge branch 'maint'Siri Hansen
2018-12-03Merge branch 'maint'Dan Gudmundsson
* maint: unicode_util did not handle binary input data correctly
2018-12-03Merge branch 'siri/et/scroll-up/ERL-780/OTP-15463' into maintSiri Hansen
* siri/et/scroll-up/ERL-780/OTP-15463: [et] Improve handling of scroll bar
2018-12-03Merge branch 'dgud/stdlib/unicode-binary-bug/ERL-777/OTP-15428' into maintDan Gudmundsson
* dgud/stdlib/unicode-binary-bug/ERL-777/OTP-15428: unicode_util did not handle binary input data correctly
2018-12-03Merge branch 'maint'Raimo Niskanen
2018-12-03Merge branch 'raimo/test-cuddling' into maintRaimo Niskanen
* raimo/test-cuddling: Parallel stress test strong_rand_bytes Update OS version numbers
2018-12-03Merge branch 'maint'Hans Nilsson
* maint: crypto: Engine valgrind fix crypto: Fix valgrind error in dh_generate/dh_compute crypto: Fix valgrind errors in pkey_crypt_nif crypto: Add some crypto:engine_unload in engine test suite crypto: Fix valgrind errors in privkey_to_pubkey crypto: Fix valgrind error for keys with passwords in Engines
2018-12-03Merge branch 'hans/crypto/valgrind-warnings/OTP-15467' into maintHans Nilsson
* hans/crypto/valgrind-warnings/OTP-15467: crypto: Engine valgrind fix crypto: Fix valgrind error in dh_generate/dh_compute crypto: Fix valgrind errors in pkey_crypt_nif crypto: Add some crypto:engine_unload in engine test suite crypto: Fix valgrind errors in privkey_to_pubkey crypto: Fix valgrind error for keys with passwords in Engines
2018-12-03crypto: Engine valgrind fixHans Nilsson
Fixes memory leak when a command has wrong type.
2018-12-03crypto: Fix valgrind error in dh_generate/dh_computeHans Nilsson
2018-12-03crypto: Fix valgrind errors in pkey_crypt_nifHans Nilsson
2018-12-03crypto: Add some crypto:engine_unload in engine test suiteHans Nilsson
Got valgrind errors for error tests otherwise
2018-12-03crypto: Fix valgrind errors in privkey_to_pubkeyHans Nilsson
2018-12-03crypto: Fix valgrind error for keys with passwords in EnginesHans Nilsson
2018-12-03Merge branch 'maint'Dan Gudmundsson
* maint: wx: Do not delay deletes of wxGraphicContext
2018-12-03Merge branch 'dgud/wx/mojave-crash/OTP-15426' into maintDan Gudmundsson
* dgud/wx/mojave-crash/OTP-15426: wx: Do not delay deletes of wxGraphicContext
2018-12-03Merge branch 'maint'Hans Bolinder
* maint: stdlib: Let calendar:system_time_to_rfc3339() keep fractions
2018-12-03Merge pull request #2036 from uabboli/hasse/stdlib/rfc3339_fraction/OTP-15464Hans Bolinder
stdlib: Let calendar:system_time_to_rfc3339() keep fractions
2018-11-30[logger] Re-create log file if deletedSiri Hansen
This is an update to logger_std_h, which makes it play well with tools like logrotate.
2018-11-30Merge branch 'maint'Hans Nilsson
* maint: crypto: Split function in otp_test_engine crypto: Update test engine with fake rsa support Correct typo in logger formatter docs
2018-11-30Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Split function in otp_test_engine crypto: Update test engine with fake rsa support
2018-11-30crypto: Split function in otp_test_engineHans Nilsson
Safer with one function to fetch public key and another for private key.
2018-11-30crypto: Update test engine with fake rsa supportHans Nilsson
We need to test the Engine interface not only for loading, key retrieval and hashing, so it is complemented with a fake rsa method to check sign/verify also.
2018-11-30Merge pull request #2034 from lpil/lpil/typoSiri Hansen
Correct typo in logger formatter docs
2018-11-30Merge branch 'john/erts/assert-dirty-aux-work'John Högberg
* john/erts/assert-dirty-aux-work: Abort when aux work runs on a dirty scheduler
2018-11-30Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release
2018-11-30Merge branch 'maint-21' into maintRickard Green
* maint-21: Updated OTP version Prepare release
2018-11-29Merge branch 'maint'Sverker Eriksson
2018-11-29Replace mathematical jargon in erl_nif docs PR-2037Bartosz Błaszków
2018-11-29Updated OTP versionOTP-21.1.4Erlang/OTP
2018-11-29Prepare releaseErlang/OTP
2018-11-29Merge branch ↵Erlang/OTP
'sverker/kernel/net_kernel-failed-accept_pending/ERL-781/OTP-15438' into maint-21 * sverker/kernel/net_kernel-failed-accept_pending/ERL-781/OTP-15438: kernel: Fix bug in net_kernel for connection attempt from self
2018-11-29stdlib: Let calendar:system_time_to_rfc3339() keep fractionsHans Bolinder
RFC3339 mentions in paragraph 5.1 that if certain conditions are fulfilled, then sorting date and time strings results in a time-ordered sequence. One of the conditions is that the strings must have the same number of fractional second digits. This commits makes sure this is indeed the case.
2018-11-29[logger] Unlink simple handler before terminatingSiri Hansen
This avoids an unexpected EXIT message with reason normal beeing printed from logger_server when the simple handler is replaced. It will still be printed if it exists unexpectedly.
2018-11-29Merge branch 'maint'Siri Hansen
2018-11-29Merge branch 'siri/logger/ets-read-concurrency/ERL-782/OTP-15453' into maintSiri Hansen
* siri/logger/ets-read-concurrency/ERL-782/OTP-15453: [logger] Add read_concurrency to options for logger ets table
2018-11-29Merge branch 'siri/logger/refactor-built-in-handlers' into maintSiri Hansen
* siri/logger/refactor-built-in-handlers: [logger] Write asynchronously to disk log [logger] Add statistics counter for drops due to message bursts [logger] Further refactor built-in handlers [logger] Move common handler code to logger_h_common
2018-11-29[et] Improve handling of scroll barSiri Hansen
2018-11-29Merge branch 'lukas/ssl/dist_benchmarks'Lukas Larsson
* lukas/ssl/dist_benchmarks: stdlib: Adjust binary bench to be faster ssl: Add scheduler utilization benchmark of plain/tls dist ssl: Link to tstsrvr to group_leader in test ssl: Add some benchmarks to test
2018-11-29stdlib: Adjust binary bench to be fasterLukas Larsson
When benchmarking releases before OTP-22 the binary:match function is very slow so it takes a long time to run the benchmarks. This commit makes the benchmark run for a shorter time which will make the results a bit less stable, but it will cut 1 hour from the benchmark regression so we will have to live with that.
2018-11-29ssl: Add scheduler utilization benchmark of plain/tls distLukas Larsson
2018-11-29ssl: Link to tstsrvr to group_leader in testLukas Larsson
If the check_ssl_node_up call is made by an rpc:call the calling process will terminate and thus the tstsrvr loop would terminate too early. We instead link with the group leader so that the look still terminates, but only if the parent node does.
2018-11-29ssl: Add some benchmarks to testLukas Larsson
The ssl benchmarks tend to break when doing other changes in ssl, so we add some of the benchmarks to be run as part of normal testing.
2018-11-28Merge branch 'maint'Rickard Green
* maint: Update patch solve forward merge version