aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2016-05-04Merge branch 'maint-18'Henrik Nord
Conflicts: OTP_VERSION lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl lib/common_test/vsn.mk
2016-05-04Merge branch 'ingela/ssl-gen-statem/OTP-13464'Ingela Anderton Andin
* ingela/ssl-gen-statem/OTP-13464: ssl: Adapt DTLS to gen_statem ssl: Use gen_statem instead of gen_fsm
2016-05-04Merge branch 'ingela/ssl_verify_SUITE/cuddle'Ingela Anderton Andin
* ingela/ssl_verify_SUITE/cuddle: ssl: Correct and clean test suite
2016-05-04ssl: Correct and clean test suiteIngela Anderton Andin
Active option was not handled correctly in all places. Dead code has been removed.
2016-05-04Merge branch 'siri/cuddle-master'Siri Hansen
* siri/cuddle-master: Extend timer in test Update crashdump_viewer_SUITE with new release numbers Set longer timetrap when creating dsa files Check that ssh application exists before starting netconf tests Improve error control when starting ssh in netconf test
2016-05-04Merge branch 'legoscia/dist-shutdown-reasons/PR-1028/OTP-13458'Zandra
* legoscia/dist-shutdown-reasons/PR-1028/OTP-13458: Error reasons for more distribution errors
2016-05-04Merge branch 'zandra/optimize-rpc/OTP-13518'Zandra
* zandra/optimize-rpc/OTP-13518: use maps instead of gb_trees to optimize the rpc server let the spawned processes handle rpc replies Conflicts: lib/runtime_tools/test/dbg_SUITE.erl
2016-05-04Merge branch 'zandra/erl_distribution_SUITE-cuddle'Zandra
* zandra/erl_distribution_SUITE-cuddle: update monitor_nodes_otp_6481_test-we only guarantee message order increase timeout since the old one risked flapping test remove no_msg timeout, since its not needed and cause flapping
2016-05-04Merge branch 'experimental/correct_dialyzer_spelling/PR-1007/OTP-13544'Hans Bolinder
* experimental/correct_dialyzer_spelling/PR-1007/OTP-13544: Correct mispelling in Dialyzer's acronym definition
2016-05-03Merge branch 'egil/erts/doc-lttng-beam-tps/OTP-10282'Björn-Egil Dahlberg
* egil/erts/doc-lttng-beam-tps/OTP-10282: erts: Rename LTTng tracepoint aio_pool_add to aio_pool_put erts: Change argument order for LTTng driver_stop runtime_tools: Document BEAM lttng tracepoints
2016-05-03Merge branch 'egil/runtime_tools/cuddle-tests'Björn-Egil Dahlberg
* egil/runtime_tools/cuddle-tests: runtime_tools: Cuddle with dbg_SUITE runtime_tools: Remove obsolete debug info in dbg_SUITE runtime_tools: Use 'infinity' gen_server calls
2016-05-03Merge branch 'egil/stdlib/fix-maps-alias/ERL-135/OTP-13534'Björn-Egil Dahlberg
* egil/stdlib/fix-maps-alias/ERL-135/OTP-13534: stdlib: Strengthen map pattern tests stdlib: Add lint tests for parallel match of maps stdlib: Refactor erl_lint_SUITE stdlib: Fix linting of map key variables
2016-05-03Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
2016-05-03ssl: Adapt DTLS to gen_statemIngela Anderton Andin
DTLS is not in working mode yet, but the gen_statem rewrite should make completion easier.
2016-05-03ssl: Use gen_statem instead of gen_fsmIngela Anderton Andin
Also reduce timing issues in tests
2016-05-03Merge branch 'lukas/erts/rename_xmqd_to_hmqd/OTP-13366'Lukas Larsson
* lukas/erts/rename_xmqd_to_hmqd/OTP-13366: erts: Rename erl flag +xmqd to +hmqd in erlexec Fix proc_lib message_queue_data spec erts: Fix total_heap_size calculation for on_heap erts: Rename erl flag +xmqd to +hmqd
2016-05-03Prepare releaseErlang/OTP
2016-05-03Merge branch 'ingela/inets/deprecated-inets_regexp/OTP-13533' into maint-18Erlang/OTP
* ingela/inets/deprecated-inets_regexp/OTP-13533: inets: Prepare for release inets: Put back inets_regexp module in OTP 18
2016-05-03Merge branch 'ingela/ssl/maint/algo-fixes/OTP-13525' into maint-18Erlang/OTP
* ingela/ssl/maint/algo-fixes/OTP-13525: ssl: Correct guard expression ssl: Correct cipher suites conversion
2016-05-03Merge branch 'peppe/ct_misc_18_patches' into maint-18Erlang/OTP
* peppe/ct_misc_18_patches: Add flag/option for disabling the character escaping functionality Fix bug using the wrong lists search function Fix bug with clashing timestamp values Fix problem with stylesheet tags getting escaped Skip pre/post test IO suite if cover or debug is running Tweak pre_post_io test case to run without failing Fix various log related problems
2016-05-03Merge branch 'peppe/ct_remove_nodelay/OTP-13462' into maint-18Erlang/OTP
* peppe/ct_remove_nodelay/OTP-13462: Update the reference manual Make the nodelay setting configurable and false per default
2016-05-03Merge branch 'lukas/erts/tracing/misc_fixes/OTP-13503'Lukas Larsson
* lukas/erts/tracing/misc_fixes/OTP-13503: erts: Add test for new procs trace with spawn_link kernel: Remove seq_trace event order dep in tc erts: Add tests for set on link tracing erts: Expand trace tests for refc binaries erts: Remove erl_tracer with invalid state erts: Remove some dead code erts: Fix broken doc link to erl_tracer Conflicts: erts/emulator/beam/erl_trace.c
2016-05-03inets: Prepare for releaseIngela Anderton Andin
2016-05-03inets: Put back inets_regexp module in OTP 18Ingela Anderton Andin
Put back unused module inets_regexp and remove it in OTP 19 instead as it is an incompatibility, although it is an undocumented module and should not affect other applications (the world is not perfect).
2016-05-02erts: Rename LTTng tracepoint aio_pool_add to aio_pool_putBjörn-Egil Dahlberg
* Be consistent.
2016-05-02erts: Change argument order for LTTng driver_stopBjörn-Egil Dahlberg
* Be consistent.
2016-05-02runtime_tools: Document BEAM lttng tracepointsBjörn-Egil Dahlberg
2016-05-02Add flag/option for disabling the character escaping functionalityPeter Andersson
OTP-13537
2016-05-02Merge branch 'ingela/ssl-max-session-table/OTP-13490'Ingela Anderton Andin
* ingela/ssl-max-session-table/OTP-13490: ssl: Adjust max table to work as expected from documentation
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-02ssh: Update the ssh_sup_SUITE testHans Nilsson
Conflicts: lib/ssh/test/ssh_sup_SUITE.erl
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-02Update the reference manualPeter Andersson
OTP-13462
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-02use maps instead of gb_trees to optimize the rpc serverZandra
2016-05-02let the spawned processes handle rpc repliesZandra
This decreases the load on the rex server.
2016-05-02Fix bug using the wrong lists search functionPeter Andersson
2016-05-02Fix bug with clashing timestamp valuesPeter Andersson
2016-05-02Fix problem with stylesheet tags getting escapedPeter Andersson
OTP-13536
2016-05-02Skip pre/post test IO suite if cover or debug is runningPeter Andersson
OTP-13535 The return value of ct:get_timetrap_info/0 has been modified.
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