aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-03-22Merge branch 'maint-21' into maintRickard Green
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-03-22Merge branch 'maint'Rickard Green
* maint:
2019-03-22Merge branch ↵Rickard Green
'lars/xmerl-scan-attribute-fixes/OTP-15684/OTP-15685/ERL-837/ERL-475' into maint * lars/xmerl-scan-attribute-fixes/OTP-15684/OTP-15685/ERL-837/ERL-475: [xmerl] Normalize attribute correctly when references are used [xmerl] Replace character refs correctly in attributes
2019-03-21Merge 'sverker/master/enif_whereis_pid-dirty-dtor/OTP-15694'Sverker Eriksson
* sverker/master/enif_whereis_pid-dirty-dtor: erts: Add test of enif_whereis* from resource destructor erts: Simplify nif_SUITE:nif_whereis* tests erts: Schedule resource destructors always
2019-03-21Merge branch 'maint'Rickard Green
2019-03-21Bump patch solve forward merge versionRickard Green
2019-03-21Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
2019-03-21Merge branch 'maint-21' into maintRickard Green
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-03-21Merge branch 'maint'Rickard Green
2019-03-21Merge commit 'a4defdd' into maintRickard Green
2019-03-21erts: Remove old encoding of pids, ports and refsSverker Eriksson
Always encode with 32-bit creation value.
2019-03-21erts: Make DFLAG_BIG_CREATION mandatorySverker Eriksson
2019-03-21ssl: Update standards compliancePéter Dimitrov
Change-Id: I365965750e4b9747bf1fb8560f34afe6eecf7f02
2019-03-21Updated OTP versionOTP-21.3.2Erlang/OTP
2019-03-21Prepare releaseErlang/OTP
2019-03-21Merge branch 'max-au/erts/dirty_scheduler_shutdown/PR-2172/OTP-15690' into ↵Erlang/OTP
maint-21 * max-au/erts/dirty_scheduler_shutdown/PR-2172/OTP-15690: erts: release dirty runqueue lock before entering endless loop when BEAM is shutting down # Conflicts: # erts/emulator/beam/erl_process.c
2019-03-21Merge branch 'rickard/dirty-resume/OTP-15688' into maint-21Erlang/OTP
* rickard/dirty-resume/OTP-15688: Fix reception of resume signal on process executing dirty
2019-03-21Merge branch ↵Erlang/OTP
'lars/xmerl-scan-attribute-fixes/OTP-15684/OTP-15685/ERL-837/ERL-475' into maint-21 * lars/xmerl-scan-attribute-fixes/OTP-15684/OTP-15685/ERL-837/ERL-475: [xmerl] Normalize attribute correctly when references are used [xmerl] Replace character refs correctly in attributes
2019-03-21Merge branch 'maint'Rickard Green
* maint:
2019-03-21Merge branch 'max-au/erts/dirty_scheduler_shutdown/PR-2172/OTP-15690' into maintRickard Green
* max-au/erts/dirty_scheduler_shutdown/PR-2172/OTP-15690: erts: release dirty runqueue lock before entering endless loop when BEAM is shutting down
2019-03-21Merge branch 'maint'Rickard Green
* maint: Fix reception of resume signal on process executing dirty
2019-03-21Merge branch 'rickard/dirty-resume/OTP-15688' into maintRickard Green
* rickard/dirty-resume/OTP-15688: Fix reception of resume signal on process executing dirty
2019-03-21Update primary bootstrapBjörn Gustavsson
2019-03-21Merge branch 'bjorn/hipe-compilation/OTP-15596'Björn Gustavsson
* bjorn/hipe-compilation/OTP-15596: HiPE: Don't fail the compilation for unimplemented instructions
2019-03-21Merge branch 'rickard/dist_ctrl_get_data/OTP-15617'Rickard Green
* rickard/dist_ctrl_get_data/OTP-15617: Testing of the example gen_tcp_dist module Add possibility to also get size of data from erlang:dist_ctrl_get_data()
2019-03-21erts: Include argument list on badarg in fixed_applyJohn Högberg
2019-03-21Merge branch 'hans/crypto/use_openssl_NO-flags/OTP-15683'Hans Nilsson
* hans/crypto/use_openssl_NO-flags/OTP-15683: crypto: Fixup unused label warning crypto: Fixup 'break strict-aliasing rules' warning crypto: Fixup 'break strict-aliasing rules' warning crypto: Fixup the ripemd160 macro chaos crypto: Test suite fix for unavailable CMAC crypto: Handle additional OPENSSL_NO_* flags
2019-03-21Merge branch 'hasse/kernel/global_async_monitor_node'Hans Bolinder
* hasse/kernel/global_async_monitor_node: kernel: Remove some obsolete code in the global module
2019-03-21Merge branch 'peterdmv/ssl/tls13-conn-info'Péter Dimitrov
* peterdmv/ssl/tls13-conn-info: ssl: Fix ssl:connection_information/1 in TLS 1.3 Change-Id: I492b0973bb4ee44354edf22ed3bc2a6e5c7b90c5
2019-03-21crypto: Fixup unused label warningHans Nilsson
2019-03-21crypto: Fixup 'break strict-aliasing rules' warningHans Nilsson
2019-03-21crypto: Fixup 'break strict-aliasing rules' warningHans Nilsson
2019-03-21crypto: Fixup the ripemd160 macro chaosHans Nilsson
2019-03-21crypto: Test suite fix for unavailable CMACHans Nilsson
2019-03-21crypto: Handle additional OPENSSL_NO_* flagsHans Nilsson
OPENSSL_NO_MD4 OPENSSL_NO_MD5 OPENSSL_NO_RC2 OPENSSL_NO_RC4 OPENSSL_NO_RMD160 OPENSSL_NO_CMAC OPENSSL_NO_CHACHA
2019-03-21Merge branch 'hasse/kernel/global_connect_tries/OTP-15607/ERIERL-280'Hans Bolinder
* hasse/kernel/global_connect_tries/OTP-15607/ERIERL-280: kernel: Global no longer tries to connect more than once
2019-03-21[logger] Replace "can not" with "cannot"Siri Hansen
2019-03-21Merge pull request #2170 from josevalim/jv-set-env-errorSiri Hansen
Error on duplicated config apps/keys in -config
2019-03-21lib/compiler/scripts/smoke: Compile some cloudi packagesBjörn Gustavsson
2019-03-21Merge pull request #2188 from bjorng/bjorn/tune-beam-3Björn Gustavsson
Tune BEAM instructions for the new compiler (part 3)
2019-03-21stdlib: Restore timeout in string_SUITE:meas()Hans Bolinder
Make sure the test case meas() terminates without failing.
2019-03-21Hardcode aes_ctr cipher infos to support older cryptolibsLoïc Hoguin
2019-03-21Merge branch 'bmk/20190320/esock/test_case_adjustements'Micael Karlberg
2019-03-21Merge branch 'bmk/20190318/gen_tcp_test_pktoptions_improvements'Micael Karlberg
2019-03-21Merge branch 'bmk/20190318/gen_tcp_compiler_adaptions'Micael Karlberg
2019-03-21Merge branch 'bmk/20190318/gen_sctp_ipv6_adjustments'Micael Karlberg
2019-03-21Merge branch 'bmk/20190318/temporary_fix_for_realtime_on_darwin'Micael Karlberg
2019-03-21Merge branch 'bmk/20190318/invalid_make_ref_at_sock_close'Micael Karlberg
2019-03-21Revert "ssl: Correct handling of crypto exception handling."Ingela Anderton Andin
This reverts commit 884503bc69157d2a3c6bd72389b4e2a800f97fb6.
2019-03-21Merge branch 'max-au/erts/dirty_scheduler_shutdown/PR-2172/OTP-15690'Lukas Larsson
* max-au/erts/dirty_scheduler_shutdown/PR-2172/OTP-15690: erts: release dirty runqueue lock before entering endless loop when BEAM is shutting down