aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-05Merge branch 'maint'Sverker Eriksson
2013-11-04Merge branch 'sverk/monitor-memory-leak/OTP-11410' into maintSverker Eriksson
* sverk/monitor-memory-leak/OTP-11410: erts: Fix memory leak for distributed monitors
2013-11-04Merge branch 'maint'Fredrik Gustafsson
2013-11-04Merge branch 'klyr/fix-ssl-npn-doc-2/OTP-11457' into maintFredrik Gustafsson
* klyr/fix-ssl-npn-doc-2/OTP-11457: Fix client_preferred_next_protocols documentation
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-04Merge branch 'Tonkpils/typo-fix/OTP-11455' into maintFredrik Gustafsson
* Tonkpils/typo-fix/OTP-11455: Update primary bootstrap Typo fix ambigous -> ambiguous
2013-11-01Update primary bootstrapFredrik Gustafsson
2013-11-01Typo fix ambigous -> ambiguousLeo Correa
2013-11-01Fix client_preferred_next_protocols documentationJulien Barbot
2013-11-01Merge branch 'maint'Lukas Larsson
* maint: erts: Add max alignment posix_memalign configure check
2013-11-01Merge branch 'lukas/erts/openbsd-posix-memalign-fix/OTP-11371' into maintLukas Larsson
* lukas/erts/openbsd-posix-memalign-fix/OTP-11371: erts: Add max alignment posix_memalign configure check
2013-11-01erts: Add max alignment posix_memalign configure checkLukas Larsson
On some OSs posix_memalign exists, but it does not allow for alignment greater than the current page size. So we have to do a runtime check for alignment size and also add cross compile options.
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-31Merge branch 'ksquaredkey/fix_inet_tls_dist/OTP-11447' into maintFredrik Gustafsson
* ksquaredkey/fix_inet_tls_dist/OTP-11447: Remove extraneous dev debug code left in the close function.
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-30Merge branch 'maint'Fredrik Gustafsson
2013-10-30Merge branch 'JakubOboza/update_install_md/OTP-11448' into maintFredrik Gustafsson
* JakubOboza/update_install_md/OTP-11448: Update INSTALL.md
2013-10-30Update INSTALL.mdJakub
Added info how to generate configure file if building from git.
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-29Merge branch 'hans/eldap/starttls/OTP-11336' into maintHans Nilsson
* hans/eldap/starttls/OTP-11336: eldap: re-fixed earlier bug fix...
2013-10-29eldap: re-fixed earlier bug fix...Hans Nilsson
2013-10-28Merge branch 'hans/eldap/starttls/OTP-11336' into maintHans Nilsson
* hans/eldap/starttls/OTP-11336: eldap: minor doc change after review. eldap: Doc eldap: Minor change (error code) eldap: Changed instruction in test/README eldap: Add START_TLS (OTP-11336)
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-28Merge branch 'hans/ssh/srcip/OTP-11339' into maintHans Nilsson
* hans/ssh/srcip/OTP-11339: ssh: Add ssh:sockname/1 incl doc and tests ssh: Add function ssh:peername/1 with test
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-24Merge branch 'peppe/common_test/cover_problem' into maintPeter Andersson
* peppe/common_test/cover_problem: Remove test_server_h from cover spec file
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 02:12:27 +0000