aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-23Merge branch 'maint'Patrik Nyblom
Conflicts: erts/doc/src/erlang.xml
2012-11-23Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maintPatrik Nyblom
* pan/process_info_spec_doc/r15/OTP-10584: Correct doc of process_info(Pid,links) OTP-10584
2012-11-23Merge branch 'pan/bs_append_crash' into maintPatrik Nyblom
* pan/bs_append_crash: Teach erts_bs_append not to dump core OTP-10590
2012-11-23Merge branch 'maint'Anders Svensson
2012-11-23Merge branch 'anders/diameter/doc/OTP-10568' into maintAnders Svensson
* anders/diameter/doc/OTP-10568: Update doc for RFC 6733 Add copies of RFC's 6733 and 6737
2012-11-23Merge branch 'anders/diameter/doc/OTP-10471' into maintAnders Svensson
* anders/diameter/doc/OTP-10471: Add missing diameter_codec(3) content Add content to diameter_codec(3) and diameter_make(3) Add reference pages diameter_codec(3) and diameter_make(3)
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Update copyright yearsBjörn-Egil Dahlberg
2012-11-23Merge branch 'peppe/common_test/group_search_r15b03.fix'Peter Andersson
2012-11-23Add missing diameter_codec(3) contentAnders Svensson
2012-11-23Merge branch 'peppe/common_test/group_search_r15b03.fix' into maintPeter Andersson
* peppe/common_test/group_search_r15b03.fix: Fix silly bug
2012-11-23Fix silly bugPeter Andersson
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Merge branch 'egil/fix-crash_dump-lc-assert' into maintBjörn-Egil Dahlberg
* egil/fix-crash_dump-lc-assert: erts: Suppress lock assertion when dumping a crash
2012-11-22Update doc for RFC 6733Anders Svensson
2012-11-22Add copies of RFC's 6733 and 6737Anders Svensson
6733 deprecates 3588.
2012-11-22Add content to diameter_codec(3) and diameter_make(3)Anders Svensson
2012-11-22Add reference pages diameter_codec(3) and diameter_make(3)Anders Svensson
Not yet any content to speak of.
2012-11-22Correct doc of process_info(Pid,links)Patrik Nyblom
2012-11-22Merge branch 'maint'Peter Andersson
2012-11-22Merge remote branch 'origin/peppe/common_test/group_search_docs' into maintPeter Andersson
* origin/peppe/common_test/group_search_docs: Document the new group search feature OTP-10466
2012-11-22Teach erts_bs_append not to dump corePatrik Nyblom
When erts_bs_append() calls the garbage collector, it has set the PB_ACTIVE_WRITER flag in the ProcBin for the binary object is about to be appended to. Therefore, it is expected that the garbage collector should neither move nor shrink the binary object. But if the garbage collector does a minor collection (thereby clearing the PB_ACTIVE_WRITER flag in the ProcBin) and there is still not enough heap space, there will be a second major garbage collection. During the major collection (since the the PB_ACTIVE_WRITER flag was cleared), the binary object may be shrunk or moved (depending on sizes and how many other writable binaries there are in the process). Avoid the problem by clearing the PB_ACTIVE_WRITER flags in a separate pass after the garbage collection(s). Thanks to Denis Titoruk for helping us find this bug.
2012-11-22Merge branch 'maint'Fredrik Gustafsson
* maint: is_boolean/1 is called instead of checking Removed ip options to gen_tcp from ssh.erl
2012-11-22Merge branch 'fredrik/ssh/fix-dialyzer-warn-r15b03' into maintFredrik Gustafsson
* fredrik/ssh/fix-dialyzer-warn-r15b03: is_boolean/1 is called instead of checking Removed ip options to gen_tcp from ssh.erl
2012-11-21Document the new group search featurePeter Andersson
2012-11-21Merge branch 'sverk/ets_SUITE-heir-core'Sverker Eriksson
* sverk/ets_SUITE-heir-core: stdlib: Tweak ets_SUITE:heir to not exhaust memory
2012-11-21Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-21Merge branch 'ia/pan/fix-public-key-doc' into maintIngela Anderton Andin
* ia/pan/fix-public-key-doc: Make public_key doc compile again
2012-11-21Make public_key doc compile againPatrik Nyblom
2012-11-21Merge branch 'maint'Björn-Egil Dahlberg
2012-11-21Merge branch 'ph/erl_interface/check-thread-support/OTP-10581' into maintBjörn-Egil Dahlberg
* ph/erl_interface/check-thread-support/OTP-10581: Teach erl_interface configure more pthread support
2012-11-21Merge branch 'as/ssl-sha224-fixes'Henrik Nord
* as/ssl-sha224-fixes: SSL: TLS 1.2, advertise sha224 support OTP-10586
2012-11-21Merge branch 'hm/wx-silent_start'Henrik Nord
* hm/wx-silent_start: Enable silent start of wx OTP-10585
2012-11-21Merge branch 'siri/test_server/erl2html-indent-problem/OTP-9710'Siri Hansen
* siri/test_server/erl2html-indent-problem/OTP-9710: [test_server] Minimize memory usage in erl2html2:convert/[2,3] [test_server] Fix erl2html2.erl to handle badly indented files
2012-11-21is_boolean/1 is called instead of checkingFredrik Gustafsson
2012-11-20Removed ip options to gen_tcp from ssh.erlFredrik Gustafsson
2012-11-20Merge branch 'maint'Peter Andersson
Conflicts: lib/common_test/test/Makefile
2012-11-20[test_server] Minimize memory usage in erl2html2:convert/[2,3]Siri Hansen
Reading form by form and line by line, instead of reading the complete file in one go.
2012-11-20Merge remote branch 'origin/peppe/common_test/group_search_r15b03' into maintPeter Andersson
* origin/peppe/common_test/group_search_r15b03: Fix problem with test case order in group specifications Finish the test suite and correct remaining bugs Implement new group search functionality OTP-10466
2012-11-20Merge branch 'maint'Peter Andersson
2012-11-20Merge remote branch 'origin/peppe/common_test/config_broken_r15b03' into maintPeter Andersson
* origin/peppe/common_test/config_broken_r15b03: Fix problem with config start option not accepting list of files OTP-10495
2012-11-19[test_server] Fix erl2html2.erl to handle badly indented filesSiri Hansen
Line numbering of erlang files that were not correctly indented could be wrong after coverting to html with erl2html2:convert/[2,3]. This has been corrected. This commit also fixes the following: * There are now link targets for each line and not only for each 10th line - meaning that links from test logs are now to the exact line, and not to the last number for which N rem 10 == 0. * there will only be one link target per function, i.e. the faulty link targets for function clauses are removed. * link targets for function now includes the arity (e.g. func/1 has a link target "func-1") And some tests are added.
2012-11-19Fix problem with test case order in group specificationsPeter Andersson
2012-11-19Fix bad assertRickard Green
2012-11-19Merge branch 'maint'Anders Svensson
2012-11-19Merge branch 'anders/diameter/R15B03_release/OTP-10582' into maintAnders Svensson
* anders/diameter/R15B03_release/OTP-10582: vsn -> 1.3 Update appup for R15B03 Dialyzer fix Insert missing 1.1 release notes Minor test suite tweaks vsn -> 1.2.1 Update appup for OTP-10461/10550
2012-11-19Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-19vsn -> 1.3Anders Svensson
2012-11-19Update appup for R15B03Anders Svensson
2012-11-19Dialyzer fixAnders Svensson
The removed clause was added in commit c14ef2db as part of an aborted implementation.