aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2013-11-04Merge branch 'maint'Fredrik Gustafsson
2013-11-04Merge branch 'cmeiklejohn/csm-fix-memsup-problems/OTP-11454' into maintFredrik Gustafsson
* cmeiklejohn/csm-fix-memsup-problems/OTP-11454: Fix incorrect reporting of memory on OS X via memsup.
2013-11-04Merge branch 'maint'Fredrik Gustafsson
2013-11-01Typo fix ambigous -> ambiguousLeo Correa
2013-11-01Merge branch 'maint'Fredrik Gustafsson
2013-11-01Merge branch 'tsloughter/ssh_doc_fix/OTP-11449' into maintFredrik Gustafsson
* tsloughter/ssh_doc_fix/OTP-11449: fix private_key type documentation in ssh_server_key_api
2013-10-31Fix incorrect reporting of memory on OS X via memsup.Christopher Meiklejohn
Application memsup should be calculating free memory using the speculative pages, in the same manner that the Activity Monitor and top programs on OS X do. In addition, correct page size to 4096, based on verification of available memory between top, vm_stat and Activity Monitor.
2013-10-31Merge branch 'maint'Fredrik Gustafsson
2013-10-31Merge branch 'gomoripeti/pgo-cover-export-all/OTP-11439' into maintFredrik Gustafsson
* gomoripeti/pgo-cover-export-all/OTP-11439: tools: Fix compile_beam_opts testcase Take compiler options from beam in cover:compile_beam
2013-10-31fix private_key type documentation in ssh_server_key_apiTristan Sloughter
2013-10-31Merge branch 'maint'Fredrik Gustafsson
2013-10-31Remove extraneous dev debug code left in the close function.Ken Key
We do not need a traceback on every close in inet_tls_dist and this breaks using nodetool in control scripts on SSL clustered nodes
2013-10-30tools: Fix compile_beam_opts testcaseFredrik Gustafsson
2013-10-30Take compiler options from beam in cover:compile_beamPéter Gömöri
Similarly to cover compiling from source (in this case some user specified compiler options are allowed) when cover compiling from existing beam take a filtered list of compiler options from the beamfile. This way e.g. export_all can be preserved. See use case in eb02beb1c3
2013-10-29Merge branch 'maint'Fredrik Gustafsson
2013-10-29Merge branch 'hawk/regexp_marker/OTP-11442' into maintFredrik Gustafsson
* hawk/regexp_marker/OTP-11442: Add XML marker for regexp syntax
2013-10-29Merge branch 'maint'Hans Nilsson
2013-10-29eldap: re-fixed earlier bug fix...Hans Nilsson
2013-10-28eldap: minor doc change after review.Hans Nilsson
2013-10-28eldap: DocHans Nilsson
2013-10-28eldap: Minor change (error code)Hans Nilsson
2013-10-28eldap: Changed instruction in test/READMEHans Nilsson
2013-10-28eldap: Add START_TLS (OTP-11336)Hans Nilsson
2013-10-28ssh: Add ssh:sockname/1 incl doc and testsHans Nilsson
OTP-11345, sto575, tsk374
2013-10-28ssh: Add function ssh:peername/1 with testHans Nilsson
OTP-11345, sto575, tsk374
2013-10-25Add XML marker for regexp syntaxHåkan Mattsson
2013-10-25Merge branch 'maint'Fredrik Gustafsson
2013-10-25Merge branch 'puzza007/emacs_iodata_nonempty_string_builtin_types/OTP-11394' ↵Fredrik Gustafsson
into maint * puzza007/emacs_iodata_nonempty_string_builtin_types/OTP-11394: Add iodata, nonempty_string to built-in type highlighting for emacs
2013-10-24Merge branch 'maint'Peter Andersson
2013-10-24Remove test_server_h from cover spec filePeter Andersson
2013-10-23Merge branch 'RoadRunnr/fix_dtls_fragment_decoder/OTP-11376'Fredrik Gustafsson
* RoadRunnr/fix_dtls_fragment_decoder/OTP-11376: ssl: fix initialization of DTLS fragment reassembler
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-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/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-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-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