aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-06-09Merge branch 'egil/lttng-change-domain'Björn-Egil Dahlberg
* egil/lttng-change-domain: runtime_tools: Change LTTng dyntrace domain erts: Change LTTng otp domain
2016-06-09Merge branch 'hans/inets/cuddle_httpc_tests'Hans Nilsson
2016-06-09Merge branch 'hans/ssh/update_tests/OTP-13573'Hans Nilsson
2016-06-09Merge branch 'ingela/ssl/crl-find-issuer/OTP-13656'Ingela Anderton Andin
* ingela/ssl/crl-find-issuer/OTP-13656: ssl: Propagate error so that public_key crl validation process continues correctly and determines what should happen.
2016-06-09ssl: Propagate error so that public_key crl validation process continuesIngela Anderton Andin
correctly and determines what should happen.
2016-06-09Merge branch 'hasse/edoc/fix_maps_type/PR-1014'Hans Bolinder
* hasse/edoc/fix_maps_type/PR-1014: edoc: Fix new Maps syntax
2016-06-09Merge branch 'essen/ssl-getstat/PR-987/OTP-13415'Ingela Anderton Andin
* essen/ssl-getstat/PR-987/OTP-13415: Add ssl:getstat/1 and ssl:getstat/2 Export type inet:stat_option/0
2016-06-09Add ssl:getstat/1 and ssl:getstat/2Loïc Hoguin
These functions call getstat on the underlying TCP socket. The only way to do this before now was to use a hack, either by looking inside the #sslsocket{} record directly, or by not using the SSL listen/accept functions and upgrading from a TCP socket that is kept around for the purpose of calling getstat later on.
2016-06-09Export type inet:stat_option/0Loïc Hoguin
For use in ssl:getstat/{1,2}.
2016-06-09Merge branch 'stavros/dialyzer/fix_call_site_analysis/OTP-13655/PR-1092'Hans Bolinder
* stavros/dialyzer/fix_call_site_analysis/OTP-13655/PR-1092: Fix a bug in Dialyzer related to call-site analysis
2016-06-09ssh: anonymize two unused variables in test suiteHans Nilsson
2016-06-09ssh: skip test suites if no crypto lib is installedHans Nilsson
2016-06-09Merge branch 'raimo/uds-support/OTP-13643'Raimo Niskanen
* raimo/uds-support/OTP-13643: Document the local (unix) address family Remove internal state BOUND from inet_drv
2016-06-09Merge branch 'hasse/dialyzer/fix_constraint_loop/ERL-157/OTP-13653'Hans Bolinder
* hasse/dialyzer/fix_constraint_loop/ERL-157/OTP-13653: Dialyzer: Fix a bug that caused Dialyzer to go into an infinite loop.
2016-06-09Document the local (unix) address familyRaimo Niskanen
2016-06-08Merge branch 'rickard/misc-ds'Rickard Green
* rickard/misc-ds: Replace enif_is_on_dirty_scheduler() with enif_thread_type() No GC on dirty IO schedulers
2016-06-08Replace enif_is_on_dirty_scheduler() with enif_thread_type()Rickard Green
2016-06-08No GC on dirty IO schedulersRickard Green
2016-06-08Remove internal state BOUND from inet_drvRaimo Niskanen
2016-06-08runtime_tools: Change LTTng dyntrace domainBjörn-Egil Dahlberg
From 'com_ericsson_dyntrace' to 'org_erlang_dyntrace'. This domain name is more suitable.
2016-06-08erts: Change LTTng otp domainBjörn-Egil Dahlberg
From 'com_ericsson_otp' to 'org_erlang_otp'. This domain name is more suitable.
2016-06-08Merge branch 'zandra/test_server/unmatched_returns/OTP-13345'Zandra Hird
* zandra/test_server/unmatched_returns/OTP-13345: vts - Fix unmatched_return warnings test_server_sup - Fix unmatched_return warnings test_server_node - Fix unmatched_return warnings test_server_io - Fix unmtached_return warnings test_server_gl - Fix unmatched_return warnings test_server_ctrl - Fix unmatched_return warnings test_server - fix unmatched_return warnings remove unused purify functions
2016-06-08Merge branch 'zandra/debugger/unmatched_returns/OTP-13345'Zandra Hird
* zandra/debugger/unmatched_returns/OTP-13345: dbg_wx* - fix remaining unmached_return warnings dbg_wx_* - fix unmatched return warnings int - fix unmatched_return warnings i - fix unmatched_return warnings dbg_debugged - fix unmatched_return warnings dbg_iserver - fix unmatched_return warnings
2016-06-08Merge branch 'josevalim/supervisor-get-callback-module/PR-1000/OTP-13619'Siri Hansen
* josevalim/supervisor-get-callback-module/PR-1000/OTP-13619: Return callback module in supervisor format_status
2016-06-08Merge branch 'siri/cdv/port-controls-forker-process/OTP-13647'Siri Hansen
* siri/cdv/port-controls-forker-process/OTP-13647: [cdv] Allow port info "Port controls forker process"
2016-06-08Fix a bug in Dialyzer related to call-site analysisStavros Aronis
Dialyzer's "dataflow" module is using information from the callgraph to determine which functions may be called at a particular call-site. Unfortunately this information can include functions that are certainly not among the possible choices. We don't want to emit warnings in such cases, so a "reasonable" compromise is to stay silent if there are many possible funs and at least one of them can succeed. Bug reported by Dan Gudmundsson, test shrunk down by Magnus Lång.
2016-06-08edoc: Fix new Maps syntaxHans Bolinder
2016-06-08Merge branch 'peppe/common_test/log_tests'Peter Andersson
* peppe/common_test/log_tests: Write suite that tests the API for printing to log
2016-06-08Merge branch 'peppe/common_test/fix_failing_tests'Peter Andersson
* peppe/common_test/fix_failing_tests: Make sure test node shuts down before skipping suite Measure file i/o overhead and skip test if the speed is too slow Skip test cases if cover or debug is running
2016-06-08Merge branch 'talentdeficit/compiler/env_compiler_options/PR-1091/OTP-13654'Björn Gustavsson
* talentdeficit/compiler/env_compiler_options/PR-1091/OTP-13654: compile.xml: Eliminate unsightly space before period Compiler: new function env_compiler_options/0
2016-06-08Merge branch 'egil/erts/fix-clang-compiler-warnings'Björn-Egil Dahlberg
* egil/erts/fix-clang-compiler-warnings: erl_interface: Let struct iovec * be visible erts: Let clang have suppressable unused variables erts: Remove tautological compare warning
2016-06-08compile.xml: Eliminate unsightly space before periodBjörn Gustavsson
2016-06-08Dialyzer: Fix a bug that caused Dialyzer to go into an infinite loop.Hans Bolinder
Dialyzer failed to remove all loops among constraints.
2016-06-07Compiler: new function env_compiler_options/0alisdair sullivan
retrieve the value of the environment variable ERL_COMPILER_OPTIONS in the same manner as used by file/2, forms/2 and output_generated/2
2016-06-07httpc: Replaced deprecated module random with recommended module rand in ↵Hans Nilsson
httpc_SUITE
2016-06-07vts - Fix unmatched_return warningsZandra
2016-06-07test_server_sup - Fix unmatched_return warningsZandra
2016-06-07test_server_node - Fix unmatched_return warningsZandra Hird
2016-06-07test_server_io - Fix unmtached_return warningsZandra
2016-06-07test_server_gl - Fix unmatched_return warningsZandra
2016-06-07test_server_ctrl - Fix unmatched_return warningsZandra
2016-06-07test_server - fix unmatched_return warningsZandra
2016-06-07erl_interface: Let struct iovec * be visibleBjörn-Egil Dahlberg
2016-06-07Write suite that tests the API for printing to logPeter Andersson
2016-06-07erts: Let clang have suppressable unused variablesBjörn-Egil Dahlberg
2016-06-07ssh: log cryptolib version in ssh_algorithms_SUITEHans Nilsson
2016-06-07ssh: TC ssh_connection_SUITE:small_iterrupted_sendHans Nilsson
2016-06-07ssh: ssh_connection_SUITE:interrupted_send separate result collector processHans Nilsson
2016-06-07ssh: logging in test helper ssh_echo_serverHans Nilsson
2016-06-07remove unused purify functionsZandra