aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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-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-07erts: Remove tautological compare warningBjörn-Egil Dahlberg
2016-06-07Merge branch 'ingela/ssl/unexpected-client-cert/OTP-13651'Ingela Anderton Andin
* ingela/ssl/unexpected-client-cert/OTP-13651: ssl: Reject unrequested client cert
2016-06-07Merge branch 'raimo/kernel/test-cuddling'Raimo Niskanen
* raimo/kernel/test-cuddling: Explain how to make inet_res_SUITE not skip gethostbyname, gethostbyaddr
2016-06-07Merge branch 'ingela/ssl/max-session-table/OTP-13490'Ingela Anderton Andin
* ingela/ssl/max-session-table/OTP-13490: ssl: Mitigate load increase when the whole session table is invalidated
2016-06-07Merge branch 'ingela/public_key/doc/OTP-13186'Ingela Anderton Andin
* ingela/public_key/doc/OTP-13186: public_key: Create application manual page that is man(6)
2016-06-07Merge branch 'hans/inets/ftp/fix_bugs/OTP-13644'Hans Nilsson
2016-06-07Merge branch 'hans/eldap/cuddle_tests'Hans Nilsson
2016-06-07Merge branch 'hans/ssh/use_open_socket/OTP-12860'Hans Nilsson
2016-06-07Make sure test node shuts down before skipping suitePeter Andersson
2016-06-07Merge branch 'lucafavatella/otp/remove-dead-code/PR-1085'Björn-Egil Dahlberg
* lucafavatella/otp/remove-dead-code/PR-1085: Delete dead code in `otp_build` script
2016-06-07Merge branch 'ingela/public_key/ERL-129/OTP-13554'Ingela Anderton Andin
* ingela/public_key/ERL-129/OTP-13554: public_key: Support more general name types
2016-06-07Merge branch 'dgud/wx/change-async-error'Dan Gudmundsson
* dgud/wx/change-async-error: wx: Change async error handling
2016-06-07Merge branch 'ingela/ssl/phase-out-sslv2-hello/OTP-13465'Ingela Anderton Andin
* ingela/ssl/phase-out-sslv2-hello/OTP-13465: ssl: Add option to phase out support for sslv2 client hello
2016-06-07Merge branch 'dotsimon/erts/heart_no_kill/OTP-13650'Lukas Larsson
* dotsimon/erts/heart_no_kill/OTP-13650: erts: make HEART_NO_KILL have to be set to TRUE Don't kill old erlang if HEART_NO_KILL is set Conflicts: lib/kernel/doc/src/heart.xml
2016-06-06Measure file i/o overhead and skip test if the speed is too slowPeter Andersson
2016-06-04Return callback module in supervisor format_statusJosé Valim
The previous implementation of supervisor:get_callback_module/1 used sys:get_status/1 to get the supervisor inner state and retrieve the callback module. Such implementation forbids any other supervisor implementation that has an internal state different than the #state{} record in supervisor.erl. This patch allows supervisors to return the callback module as part of the sys:get_status/1 data, no longer coupling the callback module implementation with the inner #state{} record. Notice we have kept the clause matching the previous sys:get_status/1 reply for backwards compatibility purposes.
2016-06-03ssl: Reject unrequested client certIngela Anderton Andin
2016-06-03ssl: Mitigate load increase when the whole session table is invalidatedIngela Anderton Andin
2016-06-03Merge remote-tracking branch 'github/pr/1087'Ingela Anderton Andin
* github/pr/1087: Move misplaced period in ssl documentation
2016-06-03Explain how to make inet_res_SUITE not skipRaimo Niskanen
2016-06-03public_key: Create application manual page that is man(6)Ingela Anderton Andin
2016-06-03Merge branch 'kostis/edoc/add_specs/PR-1077'Dan Gudmundsson
* kostis/edoc/add_specs/PR-1077: edoc_run: Add types and specs
2016-06-03[cdv] Allow port info "Port controls forker process"Siri Hansen
2016-06-03gethostbyname, gethostbyaddrRaimo Niskanen
2016-06-03ftp: make rottend tc:s work againHans Nilsson
2016-06-03ftp: Test suites updatesHans Nilsson
- add timetrap to ftp test suite - removed non-existing tc from ftp_SUITE:all() - moved tc:s missplaced in ftp_SUITE
2016-06-03ftp: fix error code errors incl extend test suitesHans Nilsson
2016-06-03ssl: Add option to phase out support for sslv2 client helloIngela Anderton Andin
ssl servers can recognize sslv2 client hellos to interop with clients that support higher version of SSL/TLS but also offers sslv2 Conflicts: lib/ssl/src/tls_connection.erl
2016-06-03Update primary bootstrapBjörn Gustavsson
2016-06-03Merge branch 'bjorn/compiler/misc'Björn Gustavsson
* bjorn/compiler/misc: misc_SUITE: Cover the remaining lines in beam_peep Avoid the dreaded "no_file" in warnings Eliminate crash for map updates in guards beam_block: Eliminate crash in beam_utils
2016-06-03erts: make HEART_NO_KILL have to be set to TRUELukas Larsson
2016-06-03Move misplaced period in ssl documentationKenneth Lakin
2016-06-03Update primary bootstrapBjörn-Egil Dahlberg
2016-06-03Merge branch 'jv/compiler/mapsify-rec_env/PR-1082/OTP-13646'Björn-Egil Dahlberg
* jv/compiler/mapsify-rec_env/PR-1082/OTP-13646: Convert dict() to map() in rec_env.erl
2016-06-03wx: Change async error handlingDan Gudmundsson
Previously error from async functions made an exit when the next sync call checked the message queue. This have been changed to an error report instead since the errors where async there where really hard to handle. Also changed the error report format to make it easier to filter them with a custom error_handler.
2016-06-03public_key: Support more general name typesIngela Anderton Andin
2016-06-03misc_SUITE: Cover the remaining lines in beam_peepBjörn Gustavsson
2016-06-03Delete dead code in `otp_build` scriptLuca Favatella
In options `plain` and `smp`, code checking for option being `opt` had been dead since R12B-5.
2016-06-02ssh: temp fix hazard in test suiteHans Nilsson