aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-03-22Merge pull request #2184 from johanclaesson/erldocDan Gudmundsson
Emacs erldoc updates OTP-15699
2019-03-22Merge branch 'hans/crypto/aead_error_handling'Hans Nilsson
* hans/crypto/aead_error_handling: crypto: New error schema in aead.c crypto: Move new error macros to common.h crypto: Use key length in alias/2
2019-03-22crypto: New error schema in aead.cHans Nilsson
2019-03-22crypto: Move new error macros to common.hHans Nilsson
2019-03-22crypto: Use key length in alias/2Hans Nilsson
2019-03-22Merge branch 'siri/logger/cannot/OTP-14282'Siri Hansen
* siri/logger/cannot/OTP-14282: [logger] Replace "can not" with "cannot"
2019-03-22Merge branch 'hans/crypto/cuddle_docs'Hans Nilsson
* hans/crypto/cuddle_docs: crypto: Remove old comment crypto: Restore 'error' as result of failed aead decryption crypto: Update types of hash algorithms crypto: Cuddle error types and documentation of them crypto: Note about key lengths for cipher_info/1 crypto: Update CipherModes for PR/2186 crypto: Declare *_info return map and other review-comments crypto: Declare *_info return map and other review-comments crypto: Document hash_info/1 and cipher_info/1 crypto: Rename block_crypto_with/without to match stream_cipher names crypto: New types (block_cipher)
2019-03-22crypto: Remove old commentHans Nilsson
2019-03-22crypto: Restore 'error' as result of failed aead decryptionHans Nilsson
2019-03-22crypto: Update types of hash algorithmsHans Nilsson
2019-03-22crypto: Cuddle error types and documentation of themHans Nilsson
2019-03-22crypto: Note about key lengths for cipher_info/1Hans Nilsson
2019-03-22crypto: Update CipherModes for PR/2186Hans Nilsson
2019-03-22crypto: Declare *_info return map and other review-commentsHans Nilsson
2019-03-22crypto: Declare *_info return map and other review-commentsHans Nilsson
Conflicts: lib/crypto/doc/src/crypto.xml
2019-03-22crypto: Document hash_info/1 and cipher_info/1Hans Nilsson
2019-03-22crypto: Rename block_crypto_with/without to match stream_cipher namesHans Nilsson
2019-03-22crypto: New types (block_cipher)Hans Nilsson
2019-03-22Merge pull request #2186 from essen/improve-cipher-infoHans Nilsson
Make crypto:cipher_info work for all ciphers and aliases OTP-15655
2019-03-22Merge pull request #2159 from dotsimon/asn1_pedefsIngela Andin
ASN.1: fix various problems with value definitions OTP-15697
2019-03-22Merge branch 'peterdmv/ssl/document-tls13/OTP-13819'Péter Dimitrov
* peterdmv/ssl/document-tls13/OTP-13819: ssl: Update standards compliance Change-Id: Ie743a61fff2416abc741e1508864480a09091add
2019-03-22Merge pull request #2185 from dotsimon/gitignore_asn1_testIngela Andin
Remove asn1/test items from .gitignore
2019-03-22Merge branch 'john/erts/fix-badarg-fixed_apply'John Högberg
* john/erts/fix-badarg-fixed_apply: erts: Include argument list on badarg in fixed_apply
2019-03-22Merge branch 'john/erts/unc-path-size-fix/OTP-15693'John Högberg
* john/erts/unc-path-size-fix/OTP-15693: erts: Fix incorrect UNC path length calculation
2019-03-22erts: Fix incorrect UNC path length calculationJohn Högberg
This didn't cause any issues for the most part since the path was still properly formed, but it broke down when appending the wildcards in file:list_dir/1. The ASSERT_PATH_FORMAT macro would have caught this in no time, but it went unnoticed because we don't run debug builds on Windows.
2019-03-22Merge branch 'ingela/ssl/default-supported-versions/OTP-14865'Ingela Anderton Andin
* ingela/ssl/default-supported-versions/OTP-14865: ssl: Remove default support for legacy versions
2019-03-22Merge branch 'hasse/stdlib/restore_string_SUITE_timeout'Hans Bolinder
* hasse/stdlib/restore_string_SUITE_timeout: stdlib: Restore timeout in string_SUITE:meas()
2019-03-22Merge branch 'maint'Rickard Green
* maint: # Conflicts: # make/otp_version_tickets_in_merge
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 12:06:13 +0000