aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-12-04Merge branch 'maint'Raimo Niskanen
Conflicts: lib/ssl/src/inet_tls_dist.erl lib/ssl/src/ssl_dist_sup.erl lib/ssl/src/ssl_tls_dist_proxy.erl
2017-12-04Merge branch 'raimo/ssl-dist-bench/OTP-14657'Raimo Niskanen
* origin/raimo/ssl-dist-bench/OTP-14657: Write SSL distribution benchmarks Polish SSL distribution Handle whitebox test message Correct distribution doc Use SNI when connecting Use -ssl_dist_optfile options Read in -ssl_dist_optfile to ETS Facilitate test certs with common root Stop checking DNS name for SNI
2017-12-04Merge branch 'raimo/ssl-dist-optfile-backport/OTP-14657' into maintRaimo Niskanen
* raimo/ssl-dist-optfile-backport/OTP-14657: Use SNI when connecting Use -ssl_dist_optfile options Read in -ssl_dist_optfile to ETS Facilitate test certs with common root Stop checking DNS name for SNI
2017-12-04Merge branch 'maint'Peter Andersson
2017-12-04Merge branch 'peppe/common_test/index_last_test/OTP-14281' into maintPeter Andersson
* peppe/common_test/index_last_test/OTP-14281: Show links to latest test run by using an html redirection file OTP-14281
2017-12-04Show links to latest test run by using an html redirection filePeter Andersson
2017-12-04Write SSL distribution benchmarksRaimo Niskanen
2017-12-04Use SNI when connectingRaimo Niskanen
2017-12-04Use -ssl_dist_optfile optionsRaimo Niskanen
2017-12-04Read in -ssl_dist_optfile to ETSRaimo Niskanen
2017-12-04Facilitate test certs with common rootRaimo Niskanen
2017-12-04Stop checking DNS name for SNIRaimo Niskanen
2017-12-04Merge branch 'maint'Lars Thorsen
2017-12-04Merge branch 'lars/crypto/add-engine-ctrl-cmd-string-to-api/OTP-14801' into ↵Lars Thorsen
maint * lars/crypto/add-engine-ctrl-cmd-string-to-api/OTP-14801: [crypto] Add engine_ctrl_cmd_string() to API
2017-12-04[crypto] Add engine_ctrl_cmd_string() to APILars Thorsen
2017-12-04Polish SSL distributionRaimo Niskanen
2017-12-04Handle whitebox test messageRaimo Niskanen
2017-12-04Correct distribution docRaimo Niskanen
2017-12-04Use SNI when connectingRaimo Niskanen
2017-12-04Use -ssl_dist_optfile optionsRaimo Niskanen
2017-12-04Read in -ssl_dist_optfile to ETSRaimo Niskanen
2017-12-04Merge branch 'maint'Dan Gudmundsson
* maint: mnesia: Fix error handling in abort write
2017-12-04Merge branch 'dgud/mnesia/backup-error-handling/OTP-14776' into maintDan Gudmundsson
* dgud/mnesia/backup-error-handling/OTP-14776: mnesia: Fix error handling in abort write
2017-12-04Merge pull request #1646 from tsloughter/hibernate_after_specHans Bolinder
add hibernate_after to the gen options type spec
2017-12-04Merge branch 'maint'Hans Bolinder
* maint: debugger: Do not quote variables and button names in windows
2017-12-04Merge branch 'hasse/debugger/fix_unicode/OTP-14802' into maintHans Bolinder
* hasse/debugger/fix_unicode/OTP-14802: debugger: Do not quote variables and button names in windows
2017-12-04Merge branch 'maint'Björn Gustavsson
* maint: fix output formatting in several HiPE debug BIFs
2017-12-04Merge pull request #1628 from mikpe/erts-hipe-more-print-fixesBjörn Gustavsson
fix output formatting in several HiPE debug BIFs OTP-14804
2017-12-04Update primary bootstrapBjörn Gustavsson
2017-12-04Merge branch 'bjorn/compiler/clean-up-codegen'Björn Gustavsson
* bjorn/compiler/clean-up-codegen: bs_match_SUITE: Cover more clauses in v3_codegen:bs_rename_ctx/4 Clean up and comment code generation for basic blocks Stop trying to maximize the use of x(0) Clean up collection of basic blocks
2017-12-04bs_match_SUITE: Cover more clauses in v3_codegen:bs_rename_ctx/4Björn Gustavsson
2017-12-04Clean up and comment code generation for basic blocksBjörn Gustavsson
2017-12-01Facilitate test certs with common rootRaimo Niskanen
2017-12-01debugger: Do not quote variables and button names in windowsHans Bolinder
The bug was introduced in commit 7eaaf5.
2017-12-01Merge branch 'maint'Hans Nilsson
* maint: crypto: engine_SUITE update crypto: fix pubkey_to_privkey
2017-12-01Merge branch 'hans/crypto/fix_wrong_error_return_privkey_to_pubkey' into maintHans Nilsson
* hans/crypto/fix_wrong_error_return_privkey_to_pubkey: crypto: engine_SUITE update crypto: fix pubkey_to_privkey
2017-12-01Merge branch 'maint'Hans Nilsson
* maint: public_key: Separated failing gen_ec_param test case into two because two different curve classes were tested in one TC and on one test machine only one was supported
2017-12-01Merge branch 'hans/public_key/cuddle_tests' into maintHans Nilsson
* hans/public_key/cuddle_tests: public_key: Separated failing gen_ec_param test case into two because two different curve classes were tested in one TC and on one test machine only one was supported
2017-12-01public_key: Separated failing gen_ec_param test case into twoHans Nilsson
because two different curve classes were tested in one TC and on one test machine only one was supported
2017-12-01crypto: engine_SUITE updateHans Nilsson
2017-12-01crypto: fix pubkey_to_privkeyHans Nilsson
2017-12-01Merge branch 'maint'Lars Thorsen
2017-12-01Merge branch 'lars/crypto/valgrind-fixes/OTP-14800' into maintLars Thorsen
* lars/crypto/valgrind-fixes/OTP-14800: [crypto] Fix memory leak
2017-12-01[crypto] Fix memory leakLars Thorsen
Fix memory leak in engine load code found by valgrind.
2017-12-01Merge branch 'maint'Ingela Anderton Andin
2017-12-01Merge branch 'ingela/ssl/timing' into maintIngela Anderton Andin
* ingela/ssl/timing: ssl: Align timing just in case
2017-12-01Merge branch 'peterdmv/inets/fix-httpc/OTP-14799'Péter Dimitrov
* peterdmv/inets/fix-httpc/OTP-14799: inets: Fix httpc path handling
2017-12-01Merge branch 'john/erts/efile-nif'John Högberg
OTP-14256 OTP-14797
2017-11-30Merge branch 'maint'Rickard Green
* maint: Clarification in doc of unicode:characters_to_list/2
2017-11-30Merge branch 'rickard/unicode-doc/ERL-516/OTP-14798' into maintRickard Green
* rickard/unicode-doc/ERL-516/OTP-14798: Clarification in doc of unicode:characters_to_list/2