aboutsummaryrefslogtreecommitdiffstats
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'Bruce Yinhe
2014-07-24Merge branch 'garret-smith/gs-jinterface-exceptions' into maintBruce Yinhe
OTP-12075 * garret-smith/gs-jinterface-exceptions: Include the cause when raising a new IOException
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-23Merge branch 'maint'Henrik Nord
2014-07-23Merge branch 'tuncer/system_principles-versions-typo' into maintHenrik Nord
* tuncer/system_principles-versions-typo: Fix a minor typo in system_principles/versions.xml
2014-07-22Update release notesErlang/OTP
2014-07-22Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16Erlang/OTP
* lukas/kernel/bind_with_fdopen/OTP-12061: Fix default behaviour for legacy fdopen erts: Fix inet close on prebound fds kernel: When doing an fdopen we now also bind the fd to the specified addr/port
2014-07-22Fix default behaviour for legacy fdopenHenrik Nord
Update testcase for gen_udp:open/2 with option fd
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-17Fix a minor typo in system_principles/versions.xmlTuncer Ayaz
2014-07-16Include the cause when raising a new IOExceptionGarret Smith
2014-07-15Merge branch 'maint'Bruce Yinhe
2014-07-15Merge branch 'nox/maps-shell-expansion' into maintBruce Yinhe
OTP-12063 * nox/maps-shell-expansion: Expand shell functions in map expressions
2014-07-15Merge branch 'maint'Björn-Egil Dahlberg
2014-07-15Merge branch 'egil/fix-xmerl-example' into maintBjörn-Egil Dahlberg
* egil/fix-xmerl-example: xmerl: Fix xmerl example motorcycle2html
2014-07-15Merge branch 'maint'Björn-Egil Dahlberg
2014-07-15Merge branch 'egil/maps-spec-to-doc-gen/OTP-12058' into maintBjörn-Egil Dahlberg
* egil/maps-spec-to-doc-gen/OTP-12058: edoc: More Map tests edoc: Fix Map type information for docs erl_docgen: Add Map type information for docs
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-14tools: Use call instead of cast to stop lcnt serverBjörn-Egil Dahlberg
Mitigate gen_server:cast/2 race conditions in testcases.
2014-07-14tools: Add lcnt tests for new serializingBjörn-Egil Dahlberg
2014-07-14tools: Fix lcnt serializingBjö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 'vladdu/orber_macro_fixes' into maintBruce Yinhe
OTP-12062
2014-07-11Merge branch 'maint'Bruce Yinhe
2014-07-11Merge branch 'lharc/patch-1' into maintBruce Yinhe
OPT-12055 * lharc/patch-1: documentation: maps:values() returns list of keys
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-11edoc: More Map testsBjörn-Egil Dahlberg
2014-07-11edoc: Fix Map type information for docsBjörn-Egil Dahlberg
2014-07-11erl_docgen: Add Map type information for docsBjörn-Egil Dahlberg
2014-07-11Merge branch 'maint'Erland Schönbeck
2014-07-11Merge branch 'maint-17' into maintErland Schönbeck
2014-07-10Merge branch 'maint'Siri Hansen
2014-07-10Merge branch 'siri/alarm_handler-doc/OTP-12025' into maintSiri Hansen
* siri/alarm_handler-doc/OTP-12025: Fix bug in alarm_handler documentation
2014-07-10Fix bug in alarm_handler documentationSiri Hansen
The documentation erroneously specified that clear_alarm/1 would clear *all* alarms with id AlarmId. This is now corrected according to the implementation - only the latest received alarm with the given AlarmId is cleared.
2014-07-10Merge branch 'siri/sys-FormFunc-spec/OTP-11800' into maintSiri Hansen
* siri/sys-FormFunc-spec/OTP-11800: Fix spec of format function in sys
2014-07-10Updated OTP versionOTP-17.1.2Erlang/OTP