aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-10-23Merge branch 'maint'Fredrik Gustafsson
2013-10-23Merge branch 'ates/sctp_errors_fix/OTP-11379' into maintFredrik Gustafsson
* ates/sctp_errors_fix/OTP-11379: Update primary bootstrap Add more SCTP errors as described in RFC 4960
2013-10-22Merge branch 'maint'Fredrik Gustafsson
2013-10-22Merge branch 'fredrik/tools/emacs_eunit_regexp/OTP-11417' into maintFredrik Gustafsson
* fredrik/tools/emacs_eunit_regexp/OTP-11417: tools: Add Erlang-specific compilation error regexp for erlang-eunit
2013-10-22tools: Add Erlang-specific compilation error regexp for erlang-eunitFredrik Gustafsson
This defvar was removed in a87a9699735b0a25f99397fba9576f5756da54d3 which made eunit fail on running tests in emacs.
2013-10-22Merge branch 'mh/dict_orddict_is_empty/OTP-11353'Fredrik Gustafsson
* mh/dict_orddict_is_empty/OTP-11353: Update primary bootstrap Add dict:is_empty/1 and orddict:is_empty/1
2013-10-21Merge branch 'maint'Björn-Egil Dahlberg
2013-10-21Merge branch 'egil/fix-crashdump-pointer-crash/OTP-11420' into maintBjörn-Egil Dahlberg
* egil/fix-crashdump-pointer-crash/OTP-11420: erts: Fix segfaulting crashdump writing
2013-10-21Merge branch 'egil/r17/fix-crashdump-printout/OTP-11419'Björn-Egil Dahlberg
* egil/r17/fix-crashdump-printout/OTP-11419: erts: Remove space in 'Buckets' printout erts: Remove unit in 'Time left' printout
2013-10-21Merge branch 'maint'Björn-Egil Dahlberg
2013-10-21Merge branch 'egil/orber/remove-old-ssl-test/OTP-11418' into maintBjörn-Egil Dahlberg
2013-10-21Merge branch 'maint'Fredrik Gustafsson
2013-10-21Merge branch 'mhssler/fix-doc-typos/OTP-11414' into maintFredrik Gustafsson
* mhssler/fix-doc-typos/OTP-11414: Fix ssh doc typos Fix gen_sctp doc typo Fix erts erlang.xml doc typo
2013-10-21Merge branch 'maint'Björn Gustavsson
* maint: PER/UPER: Correct encoding for single-value extensible constraints asn1ct_value: Handle named INTEGERs with constraints
2013-10-21Merge branch 'bjorn/asn1/fix-extensible-single-values/OTP-11415' into maintBjörn Gustavsson
* bjorn/asn1/fix-extensible-single-values/OTP-11415: PER/UPER: Correct encoding for single-value extensible constraints asn1ct_value: Handle named INTEGERs with constraints
2013-10-18erts: Fix segfaulting crashdump writingBjörn-Egil Dahlberg
Crashdumps initiated by out-of-memory on spawn could cause the beam to segfault during crashdump writing due to invalid pointers. The pointers are invalid since the process creation never finished. This commit remedies this problem by removing the process from crashdump printout.
2013-10-18Merge branch 'maint'Björn Gustavsson
* maint: Fix broken handling of default values for BIT STRINGs
2013-10-18Merge branch 'bjorn/asn1/fix-default-values/OTP-11319' into maintBjörn Gustavsson
* bjorn/asn1/fix-default-values/OTP-11319: Fix broken handling of default values for BIT STRINGs
2013-10-18Merge branch 'maint'Fredrik Gustafsson
2013-10-18Merge branch 'fredrik/common_test/cth_log_redirect' into maintFredrik Gustafsson
* fredrik/common_test/cth_log_redirect: common_test: Add terminate/1
2013-10-18common_test: Add terminate/1Fredrik Gustafsson
2013-10-17Merge branch 'maint'Björn Gustavsson
* maint: Cope with .erlang files that print to stdout
2013-10-17Merge branch 'bjorn/asn1/fix-dot-erlang-issue/OTP-11360' into maintBjörn Gustavsson
* bjorn/asn1/fix-dot-erlang-issue/OTP-11360: Cope with .erlang files that print to stdout
2013-10-16Merge branch 'sverk/load-nif-unicode'Sverker Eriksson
OTP-11408 * sverk/load-nif-unicode: erts: Fix bug in atom to filename conversions Fix open_ddll for win erts, crypto: Support NIF library with unicode filename on windows erts: Factor out erts_convert_filename_to_wchar() erts: Fix compiler warning erts: Fix loading of NIF library with unicode in path erts: Remove unused constant DRIVER_TAB_SIZE
2013-10-16Merge branch 'maint'Fredrik Gustafsson
2013-10-16Merge branch 'robertoaloi/cth_fix_terminate/OTP-11401' into maintFredrik Gustafsson
* robertoaloi/cth_fix_terminate/OTP-11401: common_test: added code_change/3 for gen_event behaviour The gen_event callback module expects terminate/2, not terminate/1
2013-10-16Merge branch 'maint'Sverker Eriksson
2013-10-16Merge branch 'sverk/time-consistency-test' into maintSverker Eriksson
* sverk/time-consistency-test: erts: Fix time_SUITE:consistency to work over turn of the month
2013-10-16Update primary bootstrapFredrik Gustafsson
2013-10-16Fix ssh doc typosMartin Hässler
ssh_rsa changed to 'ssh-rsa' and missing space added.
2013-10-16Fix gen_sctp doc typoMartin Hässler
'one-to-may' should be 'one-to-many'
2013-10-16Fix erts erlang.xml doc typoMartin Hässler
badargif -> badarg if
2013-10-15Merge branch 'maint'Sverker Eriksson
Conflicts: erts/preloaded/ebin/erlang.beam
2013-10-15Merge branch 'rickard-sverker/supercarrier/OTP-11149' into maintSverker Eriksson
* rickard-sverker/supercarrier/OTP-11149: (29 commits) erts: Add test case for erts_mmap erts: Add mutex to init_atoms in erts_mmap.c erts: Fix lock violation for init_atoms in erl_mmap.c erts: Fix misc minor bugs in supercarrier initialization erts: Add erts_mmap stats erts: Add erts_bld_tupleX macros erts: Rename erts_bld_atom_uint_2tup_list to *_uword_* erts: Fix bug in lookup_free_seg erts: Fix race bug in erts_munmap erts: Add HARD_DBG_MSEG erts: Refactor rbt_insert in erl_mmap erts: erts_mmap improved free seg desc management erts: Add documentation for +MMsc* system flags erts: Allow page aligned erts_munmap() erts: Sort tree in super aligned sizes (SA_SZ_ADDR_ORDER) erts: Fix ASSERT bug and void* arithmetics erts: Add mmap argument to erts_debug:get_internal_state erts: Improve erts_mmap out of free descriptor management erts: Cleanup erl_mmap erts: Add __func__ to ERTS_ASSERT macro ...
2013-10-15Merge branch 'maint'Fredrik Gustafsson
2013-10-15Merge branch 'blt/gen_server-typo/OTP-11398' into maintFredrik Gustafsson
* blt/gen_server-typo/OTP-11398: Change 'recive' to 'receive' in gen_server.erl
2013-10-14Merge branch 'maint'Fredrik Gustafsson
2013-10-14Merge branch 'fenollp/treewide_remove_unexpected_0xff/OTP-11323' into maintFredrik Gustafsson
* fenollp/treewide_remove_unexpected_0xff/OTP-11323: Remove ^L characters hidden randomly in the code. Not those used in text files as delimiters.
2013-10-14Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-10-14Merge branch 'ia/inets/http-client-cancel-request/OTP-11312' into maintIngela Anderton Andin
* ia/inets/http-client-cancel-request/OTP-11312: inets: httpc - Remove dead error handling code inets: httpc make httpc_cancel_request/[1,2] asynchronous httpc: Enhanched error handling inets: httpc improve pipelining
2013-10-14Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-10-14Merge branch 'ia/ssl/ecc-gnutls/OTP-11370' into maintIngela Anderton Andin
* ia/ssl/ecc-gnutls/OTP-11370: ssl: Fix dialyzer spec ssl: Honor TLS client ECC extension
2013-10-14ssl: Fix dialyzer specIngela Anderton Andin
2013-10-14Merge branch 'maint'Peter Andersson
2013-10-14Merge remote branch 'origin/peppe/common_test/missing_error_reports' into maintPeter Andersson
* origin/peppe/common_test/missing_error_reports: Use normal- instead of scaled timeouts in test case
2013-10-14Merge branch 'maint'Fredrik Gustafsson
2013-10-14Merge branch 'kostis/dialyzer_R16B02_fixes/OTP-11374' into maintFredrik Gustafsson
* kostis/dialyzer_R16B02_fixes/OTP-11374: Fix crash when using remote types in the tail of list types Adopt a convention about unknown modules No reason for calls to unknown modules Use the modern version of is_subtype Adopt a convention about unknown modules Fix a comment Add some more comments about what the test does
2013-10-14ssl: Honor TLS client ECC extensionIngela Anderton Andin
Also the server should only send ECC point formats extension not ECC curve extension.
2013-10-12Change 'recive' to 'receive' in gen_server.erlBrian L. Troutwine
A small spelling correction merely; no functionality change.
2013-10-11common_test: added code_change/3 for gen_event behaviourFredrik Gustafsson