aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-19Merge branch 'maint'Zandra Hird
2015-03-19Merge branch 'johanclaesson/maint' into maintZandra Hird
* johanclaesson/maint: Fix tags completion in erlang.el for GNU Emacs 23+ OTP-12583
2015-03-19Merge branch 'maint'Björn-Egil Dahlberg
2015-03-19Merge branch 'kovyl2404/maint/cpu_sup_big_loadavg/OTP-12581' into maintBjörn-Egil Dahlberg
* kovyl2404/maint/cpu_sup_big_loadavg/OTP-12581: Handle big loadavg values correctly
2015-03-19Merge branch 'essen/ssl-alpn'Zandra Hird
* essen/ssl-alpn: ssl: Add TLS-ALPN support OTP-12580
2015-03-19Add workaround for problems with s_client defaultsIngela Anderton Andin
2015-03-18Merge branch 'maint'Björn-Egil Dahlberg
2015-03-18Merge branch 'egil/dialyzer/fix-find_terminals/OTP-12577' into maintBjörn-Egil Dahlberg
* egil/dialyzer/fix-find_terminals/OTP-12577: dialyzer: Add missing clause for map in find_terminals
2015-03-18Merge branch 'egil/fix-beam_load-assert'Björn-Egil Dahlberg
* egil/fix-beam_load-assert: erts: Fix beam_load assert
2015-03-18Handle big loadavg values correctlyViacheslav V. Kovalev
Do not crash with badmatch when integer part of loadavg has more than 2 digits.
2015-03-18Merge branch 'maint'Zandra Hird
2015-03-18Merge branch 'qrilka/patch-3' into maintZandra Hird
* qrilka/patch-3: Minor comment fix
2015-03-18Merge branch 'maint'Zandra Hird
2015-03-18Merge branch 'nlmills/cleanup' into maintZandra Hird
* nlmills/cleanup: Remove unused time macros from efile_drv
2015-03-18Merge branch 'maint'Zandra Hird
2015-03-18Merge branch 'jeffweiss/fix_eldap_doc_infinity_typo' into maintZandra Hird
* jeffweiss/fix_eldap_doc_infinity_typo: fix `infinity` typo in eldap docs
2015-03-18Merge branch 'maint'Zandra Hird
2015-03-18Merge branch 'wmalik/minor-fixes' into maintZandra Hird
* wmalik/minor-fixes: Fix proc_lib doc Remove commented out code Fix make_hash description
2015-03-18Fix a race condition when calling port_info/1Anthony Ramine
This variable hold the values returned by erlang:port_info/1 and shouldn't be static. Reported-by: Heinz Nikolaus Gies
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge branch 'peppe/common_test/end_per_group_event' into maintPeter Andersson
* peppe/common_test/end_per_group_event: Always report ok to event handlers after successful cfg or tc func OTP-12279
2015-03-18Always report ok to event handlers after successful cfg or tc funcPeter Andersson
Also make sure test_server never reports failures that can be mistaken for positive results.
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge branch 'peppe/common_test/change_pre_post_io_test_timing' into maintPeter Andersson
* peppe/common_test/change_pre_post_io_test_timing: Modify test timing by enabling time multiplier and scaling OTP-12574
2015-03-18Modify test timing by enabling time multiplier and scalingPeter Andersson
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/enable_time_scaling' ↵Peter Andersson
into maint * origin/peppe/common_test/enable_time_scaling: Enable timetrap scaling for all tests
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge remote-tracking branch 'origin/peppe/fix_xcomp' into maintPeter Andersson
* origin/peppe/fix_xcomp: Modify the xcomp file for ARM and enable more flags Fix problem with variables not getting assigned during installation OTP-11441
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/tc_log_format' into maintPeter Andersson
* origin/peppe/common_test/tc_log_format: Modify the top section of the test case log file OTP-12518
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/log_cache_problem' ↵Peter Andersson
into maint * origin/peppe/common_test/log_cache_problem: Fix problem with directories not listed in expected order OTP-11400
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge remote-tracking branch ↵Peter Andersson
'origin/peppe/common_test/ct_netconfc_action_ok' into maint * origin/peppe/common_test/ct_netconfc_action_ok: Handle {ok,Data} in RPC reply (decode_rpc_reply) OTP-12491
2015-03-18Merge branch 'maint'Peter Andersson
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/public_event_mgr' ↵Peter Andersson
into maint * origin/peppe/common_test/public_event_mgr: Add documentation Add API functions for reading CT event manager references OTP-12506
2015-03-18Enable timetrap scaling for all testsPeter Andersson
2015-03-18Merge branch 'hb/doc/fix_links'Hans Bolinder
* hb/doc/fix_links: Correct links in the system documentation
2015-03-18Merge branch 'maint'Hans Bolinder
* maint: tools: Fix a Unicode bug in the tags module
2015-03-18Merge branch 'hb/tools/unicode_fix/OTP-12567' into maintHans Bolinder
* hb/tools/unicode_fix/OTP-12567: tools: Fix a Unicode bug in the tags module
2015-03-17dialyzer: Add missing clause for map in find_terminalsBjörn-Egil Dahlberg
Reported-by: Ali Sabil
2015-03-17tools: Fix a Unicode bug in the tags moduleHans Bolinder
2015-03-17Merge branch 'maint'Rickard Green
* maint: Make access to control_flags safe in non-smp emulator
2015-03-17Merge branch 'rickard/port_control_flags_crash/OTP-12544' into maintRickard Green
* rickard/port_control_flags_crash/OTP-12544: Make access to control_flags safe in non-smp emulator
2015-03-17Merge branch 'maint'Rickard Green
* maint: Fix missing quotation in LM_FIND_EMU_CC
2015-03-17Merge branch 'rickard/find_emu_cc/OTP-12388' into maintRickard Green
* rickard/find_emu_cc/OTP-12388: Fix missing quotation in LM_FIND_EMU_CC
2015-03-17Merge branch 'zandra/fix-zip-handle-link'Zandra Hird
* zandra/fix-zip-handle-link: add handle data type in zip.xml to fix broken link
2015-03-17Merge branch 'danielwhite/zip-port-leak-fix'Zandra Hird
OTP-12566 * danielwhite/zip-port-leak-fix: Describe zip handles an opaque type Document the termination semantics of a zip handle Prevent zip:zip_open/1,2 from leaking ports
2015-03-17Merge branch 'maint'Rickard Green
* maint: Minor fixes Conflicts: system/doc/system_principles/versions.xml