aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-24cerl_trees: Fix incorrect EDoc reference to the cerl moduleBjörn Gustavsson
2015-03-19cerl: Correct incorrect EDoc referencesBjörn Gustavsson
Change c_nil/1 to c_nil/0. Change c_try/3 to c_try/5. Change c_var_name/1 to var_name/1.
2015-03-19erts: Fix bug in binary_to_term with more than one big mapSverker Eriksson
2015-03-19Merge branch 'egil/maps/hamt/OTP-12585'Björn-Egil Dahlberg
* egil/maps/hamt/OTP-12585: (113 commits) erts: Fix bug in ESTACK and WSTACK kernel: Add spec for erts_debug:map_info/1 mnesia: Update mnesia tests to reflect new ETS hash erts: Ensure maps uses _rel functions in halfword erts: Do not treat errors as fatal in erl_printf_term erts: Update preloaded erts_internal.beam erts: Add map decomposition wrappers erts: Ensure halfword has correct temp-heap for maps hipe: Handle separate hashmap tag correctly erts: Fix map bug in dec_term for 32-bit debug VM stdlib: Update qlc tests to reflect new ETS hash stdlib: Remove obsolete hashmap references in io_lib erts: Enhance maps ordering tests hipe: Fix maps sort order testcase erts: Remove unused variable in crashdump creation erts: Fix typo in copy_struct for halfword emulator erts: Restrict GCC intrinsics by compiler version erts: Fix windows bug in hashmap_info erts: Fix typo in make_hash2 for 32-bit arch Fix beam_load assert ... Conflicts: erts/emulator/beam/bif.tab
2015-03-19erts: Fix bug in ESTACK and WSTACKSverker Eriksson
The [ew]default field would get uninitialised when the stack was saved and later restored. Detected by valgrind.
2015-03-19kernel: Add spec for erts_debug:map_info/1Björn-Egil Dahlberg
2015-03-19mnesia: Update mnesia tests to reflect new ETS hashBjörn-Egil Dahlberg
2015-03-19erts: Ensure maps uses _rel functions in halfwordBjörn-Egil Dahlberg
2015-03-19erts: Do not treat errors as fatal in erl_printf_termBjörn-Egil Dahlberg
2015-03-19erts: Update preloaded erts_internal.beamBjörn-Egil Dahlberg
2015-03-19erts: Add map decomposition wrappersBjörn-Egil Dahlberg
* erts_internal:map_type/1 * erts_internal:map_hashmap_children/1
2015-03-19erts: Ensure halfword has correct temp-heap for mapsBjörn-Egil Dahlberg
2015-03-19hipe: Handle separate hashmap tag correctlySverker Eriksson
This is a temporary fix, it's probably a better solution to combine into one header tag for both map types.
2015-03-19erts: Fix map bug in dec_term for 32-bit debug VMSverker Eriksson
Adding ERTS_SWORD_MAX to a pointer does not work as a way to disable a bound check. Remove the hp_end from ErtsHeapFactory as it isn't really used anyway.
2015-03-19stdlib: Update qlc tests to reflect new ETS hashBjörn-Egil Dahlberg
2015-03-19stdlib: Remove obsolete hashmap references in io_libBjörn-Egil Dahlberg
2015-03-19Merge branch 'essen/zlib-export-types'Zandra Hird
* essen/zlib-export-types: Export useful types from zlib module OTP-12584
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-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-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