aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-12-20Merge branch 'maint'Sverker Eriksson
2016-12-20Merge branch 'sverker/map-footprint-docs/OTP-14118' into maintSverker Eriksson
* sverker/map-footprint-docs: erts: Correct memory footprint for maps
2016-12-20Merge branch 'egil/ssh/use-maps-instead-of-dict/OTP-14117'Björn-Egil Dahlberg
* egil/ssh/use-maps-instead-of-dict/OTP-14117: ssh: Use maps instead of dict in ssh_sftp ssh: Remove whitespace errors in ssh_sftp.erl
2016-12-20Update preloaded modulesLukas Larsson
2016-12-20Merge branch 'mikpe/erts/system_info-atom_table/PR-1286/OTP-13976'Lukas Larsson
* mikpe/erts/system_info-atom_table/PR-1286/OTP-13976: erts: add erlang:system_info(atom_count)
2016-12-20erts: add erlang:system_info(atom_count)Mikael Pettersson
2016-12-20erts: Correct memory footprint for mapsSverker Eriksson
Small map was wrong as we should include our own top Eterm and exclude them for keys and values. Large maps was wrong as it described the theoretical minimum of a full tree, which does not happen in reality.
2016-12-20Merge branch 'maint'Siri Hansen
2016-12-20Merge branch 'siri/cdv/multi-line-slogan/ERL-318/OTP-14093' into maintSiri Hansen
* siri/cdv/multi-line-slogan/ERL-318/OTP-14093: [crashdump_viewer] Allow multiple lines in Slogan
2016-12-20Merge branch 'siri/etop/cpu-per-interval/OTP-14090' into maintSiri Hansen
* siri/etop/cpu-per-interval/OTP-14090: [etop] Show CPU utilization for last interval only
2016-12-19Merge branch 'maint'Sverker Eriksson
2016-12-19Merge branch 'sverker/cuddle-port_SUITE' into maintSverker Eriksson
* sverker/cuddle-port_SUITE: erts: Fix faulty printout in port_SUITE
2016-12-19Merge branch 'maint'Björn-Egil Dahlberg
2016-12-19Merge branch 'legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112' into maintBjörn-Egil Dahlberg
* legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112: Remove vestiges of watchdog support in heart
2016-12-19Merge branch 'egil/public_key/use-maps-instead-of-dict/OTP-14111'Björn-Egil Dahlberg
2016-12-19Merge pull request #1280 from bjorng/bjorn/effiency-guide-myths/OTP-13652Björn Gustavsson
Update the myths in the Efficiency Guide for OTP 20
2016-12-19Extend the text for "_" mythBjörn Gustavsson
Thanks to Joe Armstrong for the suggestion.
2016-12-19Shorten the tail-recursion mythBjörn Gustavsson
The myth about tail recursion being faster than body recursion still seems to be alive, but we don't need to spend that much space discussing it as we needed earlier. Shorten the discussion and include a link to to Fred Hebert's excellent blog post.
2016-12-19Merge branch 'maint'Rickard Green
* maint: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process Conflicts: erts/emulator/beam/beam_emu.c erts/etc/unix/etp-commands.in
2016-12-19Merge branch 'rickard/stacktrace-bugs' into maintRickard Green
OTP-14055 * rickard/stacktrace-bugs: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process
2016-12-19Remove faulty release note for these fixesRickard Green
2016-12-19New test cases testing stacktrace from apply on erlang:error()Rickard Green
2016-12-19Fix stactrace for apply on error/[1,2], exit/1, or throw/1Rickard Green
2016-12-19Fix stack-trace generated by a traced processRickard Green
2016-12-19erts: Fix faulty printout in port_SUITESverker Eriksson
2016-12-19Merge pull request #1288 from bjorng/bjorn/compiler/use-less-memoryBjörn Gustavsson
Reduce memory consumption during compilation
2016-12-19Merge pull request #1290 from bjorng/bjorn/stdlib/takeBjörn Gustavsson
Add take/2 to all dictionary modules OTP-14102
2016-12-19Add take/2 to all dictionary modulesBjörn Gustavsson
Similar to maps:take/2, add take/2 to the other dictionary modules in STDLIB: orddict:take(Key, Dict) -> {Val,NewDict} | 'error'. dict:take(Key, Dict) -> {Val,NewDict} | 'error'. gb_trees:take(Key, Dict) -> {Val,NewDict}. For gb_trees also add: gb_trees:take_any(Key, Dict) -> {Val,NewDict} | 'error'. gb_trees already has delete() and delete_any(), so we will follow that design pattern. Suggested by Boris Bochkaryov in https://github.com/erlang/otp/pull/1209.
2016-12-19Merge branch 'maint'Ingela Anderton Andin
2016-12-19Merge branch 'ingela/ssl/terminate/OTP-14100' into maintIngela Anderton Andin
* ingela/ssl/terminate/OTP-14100: ssl: Correct terminate behaviour
2016-12-19ssl: Correct terminate behaviourIngela Anderton Andin
When the terminate function is called explicitly, to make guarantees that for instance the reuseaddr option works as expected, we must make sure that the clean up code is not run again when gen_statem calls terminate. This check was broken in the rewrite from gen_fsm to gen_statem. Caused PEM cache errors, that in some cases would cause unexpected connection failures.
2016-12-16ssh: Use maps instead of dict in ssh_sftpBjörn-Egil Dahlberg
2016-12-16ssh: Remove whitespace errors in ssh_sftp.erlBjörn-Egil Dahlberg
2016-12-16public_key: Use maps instead of dictBjörn-Egil Dahlberg
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge branch 'sverker/cuddle-code_SUITE-versions' into maintSverker Eriksson
* sverker/cuddle-code_SUITE-versions: erts: Fix hanging race in code_SUITE:versions
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge pull request #1270 from kostis/hipe-testSverker Eriksson
hipe: one more test file and some cleanups
2016-12-16Merge branch 'maint'Björn Gustavsson
* maint: Allow escripts with only two lines Add project-wide Emacs settings file
2016-12-16Merge pull request #1279 from legoscia/emacs-dir-localsBjörn Gustavsson
Add project-wide Emacs settings file
2016-12-16Merge pull request #1275 from pjhades/fix/escriptBjörn Gustavsson
Allow escripts with only two lines OTP-14098
2016-12-16Merge branch 'maint'Hans Nilsson
2016-12-16Merge branch 'hans/eldap/cover_spec' into maintHans Nilsson
2016-12-16Merge branch 'maint'Ingela Anderton Andin
2016-12-16Merge branch 'ingela/inets/httpc-redirect-host-header/ERL-316/OTP-14097' ↵Ingela Anderton Andin
into maint * ingela/inets/httpc-redirect-host-header/ERL-316/OTP-14097: inets: httpc - Correct redirection host header
2016-12-16Merge branch 'maint'Ingela Anderton Andin
2016-12-16Merge branch 'ingela/inets/httpc-PATCH-doc' into maintIngela Anderton Andin
* ingela/inets/httpc-PATCH-doc: inets: httpc - patch method missing in doc
2016-12-15Merge branch 'maint'Hans Nilsson
2016-12-15Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2016-12-15eldap: add cover spec for nightly testsHans Nilsson