aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-27Merge branch 'maint'Sverker Eriksson
Conflicts: lib/stdlib/src/stdlib.appup.src
2015-03-27Merge branch 'sverk/large-list_to_integer-bug/OTP-12624' into maintSverker Eriksson
* sverk/large-list_to_integer-bug/OTP-12624: erts: Fix bug in list_to_integer for very large strings
2015-03-27Merge branch 'dgud/mnesia/try-catch'Dan Gudmundsson
* dgud/mnesia/try-catch: mnesia: Replace catch with try-catch
2015-03-27mnesia: Replace catch with try-catchDan Gudmundsson
Avoids building stacktraces where it is not needed and do not mask errors, i.e. only catch the relevant classes in each try.
2015-03-27Merge branch 'dgud/wx/prefer-wxMSW-3/OTP-12632'Dan Gudmundsson
* dgud/wx/prefer-wxMSW-3/OTP-12632: wx: Fix variable cursor constants wx: On Mac keyboards use meta field as raw_ctrl wx: Prefer wxWidgets-3.0. branch on windows
2015-03-27wx: Fix variable cursor constantsDan Gudmundsson
Fix cursor constants that changes with OS and wxWidgets releases.
2015-03-27wx: On Mac keyboards use meta field as raw_ctrlDan Gudmundsson
On mac and wxWidgets-3.0 the crtlDown field in keyboard and mouse events are set when command button is pressed. The ctrl key on mac keyboard is in a field called raw_control as this would be backward incompatible to add we reuse the metaDown field as indicator when the ctrl keyboard button is pressed.
2015-03-27wx: Prefer wxWidgets-3.0. branch on windowsDan Gudmundsson
Since no bug fixes are done anymore on the 2.8 branch it is time to switch the preferred version to 3.0 branch.
2015-03-27Merge branch 'dgud/observer/allocator-graphs/OTP-12631'Dan Gudmundsson
* dgud/observer/allocator-graphs/OTP-12631: observer: Fix menu code (for mac) observer: Add a new tab memory allocator charts
2015-03-27observer: Fix menu code (for mac)Dan Gudmundsson
Have been broken since: 6fe02e14d observer: Add SASL log view for processes
2015-03-27observer: Add a new tab memory allocator chartsDan Gudmundsson
Easier to the see memory usage and utilization as charts instead of values that is updating during runtime. Remove from system page and create a separate allocator tab.
2015-03-27Merge branch 'dgud/erts/fix-driver-thread-name'Dan Gudmundsson
* dgud/erts/fix-driver-thread-name: Fix thread name from driver api
2015-03-27Merge branch 'egil/fix-make_internal_hash'Björn-Egil Dahlberg
* egil/fix-make_internal_hash: erts: Fix missing case in make_internal_hash
2015-03-27Merge branch 'hb/doc/refman_type_fix'Hans Bolinder
* hb/doc/refman_type_fix: doc: Use module() in the definition of the built-in type mfa()
2015-03-26Merge branch 'sverk/hamt-encode-size-bug/OTP-12585'Sverker Eriksson
* sverk/hamt-encode-size-bug/OTP-12585: erts: Fix bug in term_to_binary size estimation for hamt erts: Optimize term_to_binary size estimation
2015-03-26erts: Fix missing case in make_internal_hashBjörn-Egil Dahlberg
2015-03-26Release Candidate 1OTP-18.0-rc1Henrik Nord
2015-03-26Update primary bootstrapHenrik Nord
2015-03-26Update preloaded modulesHenrik Nord
2015-03-26doc: Use module() in the definition of the built-in type mfa()Hans Bolinder
2015-03-26stdlib: Support upgrading from and to stdlib-2.3Björn Gustavsson
2015-03-26Merge branch 'rickard/time_api/OTP-11997'Rickard Green
* rickard/time_api/OTP-11997: Misc fixes Conflicts: erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam
2015-03-26Misc fixesRickard Green
2015-03-26Merge branch 'maint'Björn-Egil Dahlberg
2015-03-26Merge branch 'egil/maint/process_dictionary-initial-size/OTP-12535' into maintBjörn-Egil Dahlberg
* egil/maint/process_dictionary-initial-size/OTP-12535: erts: Document option 'hpds' erts: Enable command line argument for initial pd size
2015-03-26Merge branch 'egil/maps/refactor-tagscheme/OTP-12585'Björn-Egil Dahlberg
* egil/maps/refactor-tagscheme/OTP-12585: erts: Refactor Map - use multiple values ESTACK_PUSHN erts: GC needs the size even if the frag is not referenced Revert "hipe: Handle separate hashmap tag correctly" erts: Combine flat and hash maps under one unifying tag
2015-03-26Merge branch 'maint'Peter Andersson
2015-03-26Merge branch 'peppe/common_test/failing_telnet_tests' into maintPeter Andersson
* peppe/common_test/failing_telnet_tests: Add documentation and make get_data behaviour backwards compatible Introduce polling feature in ct_telnet Fix problem with invalid timeouts because of truncated floats OTP-12627
2015-03-26Add documentation and make get_data behaviour backwards compatiblePeter Andersson
2015-03-25erts: Fix bug in term_to_binary size estimation for hamtSverker Eriksson
2015-03-25erts: Optimize term_to_binary size estimationSverker Eriksson
for tuples and maps containing ascii strings (lists).
2015-03-25erts: Refactor Map - use multiple values ESTACK_PUSHNBjörn-Egil Dahlberg
2015-03-25erts: GC needs the size even if the frag is not referencedBjörn-Egil Dahlberg
2015-03-25Merge branch 'rickard/time_api/OTP-11997'Rickard Green
* rickard/time_api/OTP-11997: Fix erts_sys_hrtime() fallback
2015-03-25Fix erts_sys_hrtime() fallbackRickard Green
2015-03-25Merge branch 'bjorn/doc'Björn Gustavsson
* bjorn/doc: cerl_trees: Fix incorrect EDoc reference to the cerl module cerl: Correct incorrect EDoc references
2015-03-25Merge branch 'rickard/time_api/OTP-11997'Rickard Green
* rickard/time_api/OTP-11997: Skip not updated test-cases Fixes and cleanup
2015-03-25Skip not updated test-casesRickard Green
2015-03-25Fixes and cleanupRickard Green
2015-03-25Merge branch 'erland/OTP18/inets/time_api/OTP-12441'Erland Schönbeck
* erland/OTP18/inets/time_api/OTP-12441: inets: Add new module inets_time_compat with new time API The new module is backwards compatible.
2015-03-25Merge branch 'erland/ssh/OTP18/time_api/OTP-12444'Erland Schönbeck
* erland/ssh/OTP18/time_api/OTP-12444: ssh: Use new time API
2015-03-25Revert "hipe: Handle separate hashmap tag correctly"Björn-Egil Dahlberg
This reverts commit 4dc5f194b0a5a6f052763bb7494b0458f98d96ca.
2015-03-25erts: Combine flat and hash maps under one unifying tagBjörn-Egil Dahlberg
2015-03-25Merge branch 'sverk/hamt-term2bin-bug/OTP-12585'Sverker Eriksson
* sverk/hamt-term2bin-bug/OTP-12585: erts: Optimize hashmap_get erts: Remove HAMT_SUBTAG_NODE_ARRAY erts: Fix bug in binary_to_term for hamt when yielding erts: Rename to flatmap_from_validated_list
2015-03-25erts: Fix bug in list_to_integer for very large stringsSverker Eriksson
list_to_integer(lists:duplicate(10000000,$0)). crashed due to overflow when calculating nr heap words.
2015-03-25Merge branch 'maint'Björn-Egil Dahlberg
Conflicts: erts/emulator/beam/erl_map.c erts/emulator/test/map_SUITE.erl
2015-03-25Merge branch 'egil/fix-term-cmp/OTP-12623' into maintBjörn-Egil Dahlberg
* egil/fix-term-cmp/OTP-12623: erts: Fix comparison of exact terms
2015-03-25erts: Document option 'hpds'Björn-Egil Dahlberg
2015-03-25erts: Enable command line argument for initial pd sizeBjörn-Egil Dahlberg
Use '+hpds size' to set initial process dictionary size for spawned processes.
2015-03-25Merge branch 'maint'Erland Schönbeck