aboutsummaryrefslogtreecommitdiffstats
path: root/erts
AgeCommit message (Collapse)Author
2014-08-06Merge branch 'maint'Lukas Larsson
* maint: erts: Fix tc and docs after {fd,FD} bind change
2014-08-06Merge branch 'lukas/erts/fd_bind_tc_fix/OTP-12061' into maintLukas Larsson
* lukas/erts/fd_bind_tc_fix/OTP-12061: erts: Fix tc and docs after {fd,FD} bind change
2014-08-06erts: Fix tc and docs after {fd,FD} bind changeLukas Larsson
The sha of the original change is 52810718b
2014-08-05Merge branch 'maint'Bruce Yinhe
2014-08-05Merge branch 'derek121/epmd-docs-2' into maintBruce Yinhe
OTP-12052 * derek121/epmd-docs-2: Fix minor grammatical errors in epmd docs
2014-07-25Merge branch 'maint'Henrik Nord
2014-07-25fix xml file merge messupHenrik Nord
2014-07-24Merge branch 'maint'Henrik Nord
Conflicts: erts/preloaded/ebin/prim_inet.beam
2014-07-24Merge branch 'maint-r16' into maintHenrik Nord
Conflicts: erts/doc/src/notes.xml erts/preloaded/ebin/prim_inet.beam erts/vsn.mk lib/kernel/doc/src/notes.xml lib/kernel/vsn.mk
2014-07-22Update release notesErlang/OTP
2014-07-22erts: Fix inet close on prebound fdsBjörn-Egil Dahlberg
Inet close must remove fd from select/poll without closing the fd.
2014-07-22kernel: When doing an fdopen we now also bind the fd to the specified addr/portLukas Larsson
2014-07-21Fix minor grammatical errors in epmd docsDerek Brown
Small grammar changes.
2014-07-15Merge branch 'maint'Björn-Egil Dahlberg
2014-07-15Merge branch 'egil/lcnt-histogram/OTP-12059' into maintBjörn-Egil Dahlberg
2014-07-11Merge branch 'maint'Sverker Eriksson
2014-07-11Merge branch 'sverk/alloc-size-overflow' into maintSverker Eriksson
* sverk/alloc-size-overflow: erts: Fix size overflow bugs in memory allocation
2014-07-11Merge branch 'maint'Bruce Yinhe
2014-07-11Merge branch 'vinoski/vinoski/erl-sdio-option' into maintBruce Yinhe
OTP-12052 * vinoski/vinoski/erl-sdio-option: add missing description for erl +SDio option
2014-07-11Merge branch 'maint'Erland Schönbeck
2014-07-11Merge branch 'maint-17' into maintErland Schönbeck
2014-07-10Prepare releaseErlang/OTP
2014-07-10Merge branch 'nox/filelib-wildcard-broken-link' into maint-17Erlang/OTP
* nox/filelib-wildcard-broken-link: Update stdlib appup file Update runtime dependencies Update preloaded Add tests of filelib and symlinks Fix handling of broken symlinks in filelib Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2014-07-09erts: Add histogram to lcntBjörn-Egil Dahlberg
2014-07-09Update preloadedSiri Hansen
2014-07-09Fix handling of broken symlinks in filelibAnthony Ramine
This fixes a bug introduced in f11aabdc9fec593c31e6c4f3fa25c1707e9c35df where filelib:eval_read_file_info/2 was made to use file:read_link_info/1 to never follow symlinks. This fixed wildcard/1 but broke every other function using eval_read_file_info/2. Reported-by: Louis-Philippe Gauthier Reported-by: Danil Zagoskin
2014-07-09Merge branch 'maint'Bruce Yinhe
2014-07-02erlang:statistics(runtime) returns millisecondsMagnus Henoch
Specify in the documentation that erlang:statistics(runtime) returns milliseconds.
2014-07-02Merge branch 'maint'Magnus Lidén
2014-07-01Prepare releaseErlang/OTP
2014-06-30vxworks: Fix SYSTEMD_DAEMON_LIBS in configureBjörn-Egil Dahlberg
2014-06-30erts: Separate ethread inlining from ethread.hBjörn-Egil Dahlberg
The commit adb5dc0090bc419e2c4c1250653badbddeb6263b (ETHR_FORCE_INLINE) broke some platforms without adequate thread support.
2014-06-27erts: Fix size overflow bugs in memory allocationSverker Eriksson
2014-06-25Merge branch 'sverk/ets-wc-lock-alignment/OTP-11974'Sverker Eriksson
* sverk/ets-wc-lock-alignment/OTP-11974: erts: Fix cache alignment for ETS write_concurrency locks
2014-06-24Merge tag 'OTP-17.1'Marcus Arendt
=== OTP-17.1 === Changed Applications: - asn1-3.0.1 - common_test-1.8.1 - compiler-5.0.1 - crypto-3.4 - debugger-4.0.1 - dialyzer-2.7.1 - diameter-1.7 - erl_interface-3.7.17 - erts-6.1 - hipe-3.11 - inets-5.10.2 - kernel-3.0.1 - mnesia-4.12.1 - observer-2.0.1 - reltool-0.6.6 - ssh-3.0.3 - ssl-5.3.5 - stdlib-2.1 - syntax_tools-1.6.15 - test_server-3.7.1 - tools-2.6.15 - typer-0.9.8 - wx-1.3 Unchanged Applications: - cosEvent-2.1.15 - cosEventDomain-1.1.14 - cosFileTransfer-1.1.16 - cosNotification-1.1.21 - cosProperty-1.1.17 - cosTime-1.1.14 - cosTransactions-1.2.14 - edoc-0.7.13 - eldap-1.0.3 - erl_docgen-0.3.5 - et-1.5 - eunit-2.2.7 - gs-1.5.16 - ic-4.3.5 - jinterface-1.5.9 - megaco-3.17.1 - odbc-2.10.20 - orber-3.6.27 - os_mon-2.2.15 - ose-1.0 - otp_mibs-1.0.9 - parsetools-2.0.11 - percept-0.8.9 - public_key-0.22 - runtime_tools-1.8.14 - sasl-2.4 - snmp-4.25.1 - webtool-0.8.10 - xmerl-1.3.7
2014-06-21add missing description for erl +SDio optionSteve Vinoski
Add explanatory text for the erl +SDio option, which is used to set the number of dirty I/O schedulers.
2014-06-19Prepare releaseErlang/OTP
2014-06-18Merge branch 'maint'Björn-Egil Dahlberg
2014-06-18Merge branch 'egil/fix-doc-links' into maintBjörn-Egil Dahlberg
* egil/fix-doc-links: doc: Fix broken links in Installation Guide doc: Fix broken links
2014-06-18Update preloaded modulesMagnus Lidén
2014-06-18Merge branch 'maint'Siri Hansen
2014-06-18Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [upgrade_SUITE] Set previous major to r16b
2014-06-17doc: Fix broken links in Installation GuideBjörn-Egil Dahlberg
2014-06-17doc: Fix broken linksBjörn-Egil Dahlberg
2014-06-17Merge branch 'maint'Björn Gustavsson
* maint: Fix handling of latin1 characters in false ifdef branches add_abstract_code: Remove 'from_asm' option Remove documentation and stub for non-exist file:file_info/1
2014-06-17Merge branch 'bjorn/erts/fix-prim_eval' into maintBjörn Gustavsson
* bjorn/erts/fix-prim_eval: add_abstract_code: Remove 'from_asm' option
2014-06-16Merge branch 'maint'Rickard Green
* maint: Fix redefinition of ETHR_FORCE_INLINE Fix typo in error message in reltool_server
2014-06-16Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green
* jjhoo/mingw_compile_fix_forceinline/OTP-11945: Fix redefinition of ETHR_FORCE_INLINE
2014-06-16Fix redefinition of ETHR_FORCE_INLINERickard Green
2014-06-13Merge branch 'maint'Sverker Eriksson