aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-05-02Merge branch 'ingela/ssl/signature_algs_bug'Ingela Anderton Andin
* ingela/ssl/signature_algs_bug: ssl: Correct guard expression
2016-05-02Merge branch 'ingela/ssl/cipher_suites'Ingela Anderton Andin
* ingela/ssl/cipher_suites: ssl: Correct cipher suites conversion
2016-05-02Merge branch 'lukas/ssh/sshc_con_hand_worker'Hans Nilsson
* lukas/ssh/sshc_con_hand_worker: ssh: sshc_sup to use worker for ssh_con_handler
2016-05-02Merge branch 'dgud/observer/fix-coloring/PR-994'Dan Gudmundsson
* dgud/observer/fix-coloring/PR-994: observer: Changed info text to be wxStaticText Changed setBackgroundColour to setBackgroundStyle
2016-05-02observer: Changed info text to be wxStaticTextDan Gudmundsson
Used to be misused wxTextCtrl's but looks better with wxStaticText, at least on gtk we miss the posssbility to changes colours when hovering over them.
2016-05-02Changed setBackgroundColour to setBackgroundStyleByaruhanga Franklin
2016-05-02Merge branch 'hans/ssh/doc_sftp_error_codes/ERL-86/OTP-13347'Hans Nilsson
2016-05-02Merge branch 'hans/eldap/prepare_release'Hans Nilsson
2016-05-02Merge branch 'hans/ssh/remove_tcpip_forward'Hans Nilsson
2016-05-02Merge branch 'hans/ssh/daemon_port_0/OTP-13527'Hans Nilsson
Conflicts: lib/ssh/test/ssh_test_lib.erl
2016-05-02Merge branch 'hans/ssh/prepare_for_release'Hans Nilsson
2016-05-02Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
Conflicts: lib/ssh/test/ssh_algorithms_SUITE.erl
2016-05-02Merge branch 'hans/ssh/gen_statem/OTP-13267'Hans Nilsson
2016-05-02Update primary bootstrapBjörn Gustavsson
2016-05-02Merge branch 'bjorn/kernel/clean-up-code_server'Björn Gustavsson
* bjorn/kernel/clean-up-code_server: Introduce is_dir/1 to test for a directory Introduce split_base/1 to split into name and version string Eliminate one call to filename:split/1 Refactor get_name/1 Clean up make_path() Avoid calling absname/1 on an absolute path Clean up processing of archive files Simplify and speed up del_ebin/1 code_SUITE: Enhance test of archive files
2016-04-30Introduce is_dir/1 to test for a directoryBjörn Gustavsson
2016-04-30Introduce split_base/1 to split into name and version stringBjörn Gustavsson
2016-04-29Merge branch 'egil/erts/tracing-support-lttng/OTP-13532'Björn-Egil Dahlberg
* egil/erts/tracing-support-lttng/OTP-13532: (28 commits) runtime_tools: User's guide to LTTng and dyntrace runtime_tools: Fix Dtrace build erts: Fix gc messages in tracer_SUITE erts: Fix gc messages in sensitive_SUITE erts: Fix gc messages in trace_port_SUITE tools: Update fprof tests tools: Update fprof with new gc traces runtime_tools: Update dyntrace_lttng_SUITE tests runtime_tools: Add 'return_to' for call tracing erts: Fix return_to trace callback erts: Update erl_tracer documentation erts: Fix erl_tracer documentation typos Update preloaded erl_tracer.beam erts: Update erl_tracer type specs runtime_tools: Add lttng dyntrace tests runtime_tools: Extend 'trace' and 'enabled' tracer callbacks erts: Extend 'enabled' and 'trace' tracer callbacks runtime_tools: Extend 'enabled' tracer callbacks erts: Extend 'enabled' tracer callbacks runtime_tools: Update lttng garbage collection trace ...
2016-04-29runtime_tools: User's guide to LTTng and dyntraceBjörn-Egil Dahlberg
2016-04-29runtime_tools: Fix Dtrace buildBjörn-Egil Dahlberg
2016-04-29erts: Fix gc messages in tracer_SUITEBjörn-Egil Dahlberg
2016-04-29erts: Fix gc messages in sensitive_SUITEBjörn-Egil Dahlberg
2016-04-29erts: Fix gc messages in trace_port_SUITEBjörn-Egil Dahlberg
2016-04-29tools: Update fprof testsBjörn-Egil Dahlberg
2016-04-29tools: Update fprof with new gc tracesBjörn-Egil Dahlberg
2016-04-29runtime_tools: Update dyntrace_lttng_SUITE testsBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add 'return_to' for call tracingBjörn-Egil Dahlberg
2016-04-29erts: Fix return_to trace callbackBjörn-Egil Dahlberg
2016-04-29erts: Update erl_tracer documentationBjörn-Egil Dahlberg
2016-04-29erts: Fix erl_tracer documentation typosBjörn-Egil Dahlberg
2016-04-29Update preloaded erl_tracer.beamBjörn-Egil Dahlberg
2016-04-29erts: Update erl_tracer type specsBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add lttng dyntrace testsBjörn-Egil Dahlberg
2016-04-29runtime_tools: Extend 'trace' and 'enabled' tracer callbacksBjörn-Egil Dahlberg
Adds the following capabilities to dyntrace * enabled_running_ports/3 * enabled_running_procs/3 changed from enabled_running/3 * trace_running_ports/6 * trace_running_procs/6 changed from trace_running/6
2016-04-29erts: Extend 'enabled' and 'trace' tracer callbacksBjörn-Egil Dahlberg
Adds the following capabilities to a tracer backend * enabled_running_procs/3 changed from enabled_running/3 * enabled_running_ports/3 * trace_running_procs/6 changed from trace_running/6 * trace_running_ports/6
2016-04-29runtime_tools: Extend 'enabled' tracer callbacksBjörn-Egil Dahlberg
Adds the following capabilities to dyntrace * enabled_procs/3 * enabled_ports/3 * enabled_running/3 * enabled_call/3 * enabled_send/3 * enabled_receive/3 * enabled_garbage_collection/3
2016-04-29erts: Extend 'enabled' tracer callbacksBjörn-Egil Dahlberg
Adds the following capabilities to a tracer backend * enabled_procs/3 * enabled_ports/3 * enabled_running/3 * enabled_call/3 * enabled_send/3 * enabled_receive/3 * enabled_garbage_collection/3 These functions will fall back to enabled/3 if not provided and the tracepoint is active.
2016-04-29runtime_tools: Update lttng garbage collection traceBjörn-Egil Dahlberg
2016-04-29erts: Extend garbage collection traceBjörn-Egil Dahlberg
Replace 'gc_start' and 'gc_end' with * 'gc_minor_start' * 'gc_minor_end' * 'gc_major_start' * 'gc_major_end'
2016-04-29runtime_tools: Add lttng 'call' tracingBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add lttng 'ports' tracingBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add lttng 'send' and 'receive' tracingBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add lttng 'running' tracingBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add lttng 'procs' tracingBjörn-Egil Dahlberg
2016-04-29runtime_tools: Add lttng 'garbage_collection' tracingBjörn-Egil Dahlberg
2016-04-29Merge branch 'mikpe/fp-exceptions-cleanups/PR-1019/OTP-13531'Lukas Larsson
* mikpe/fp-exceptions-cleanups/PR-1019/OTP-13531: clean up FP exception code in sys_float.c
2016-04-29Merge branch 'mikpe/fp-exceptions-neuter-matherr/PR-1018/OTP-13531'Lukas Larsson
* mikpe/fp-exceptions-neuter-matherr/PR-1018/OTP-13531: matherr() must not fake an FP exception
2016-04-29ssh: sshc_sup to use worker for ssh_con_handlerLukas Larsson
2016-04-29Merge branch 'sverk/big-external-creations.OTP-13488'Sverker Eriksson
second merge of this branch with some bug fixing
2016-04-29ssh: undocumented, untestesd and experimental tcpip_forward code removedHans Nilsson