aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-17Fix a minor typo in system_principles/versions.xmlTuncer Ayaz
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
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-10Update stdlib appup fileSiri Hansen
Allow upgrade from OTP 17.1 to newer.
2014-07-09tools: Add histogram to lcntBjörn-Egil Dahlberg
2014-07-09erts: Add histogram to lcntBjörn-Egil Dahlberg
2014-07-09Update runtime dependenciesSiri Hansen
2014-07-09Update preloadedSiri Hansen
2014-07-09Add tests of filelib and symlinksSiri Hansen
This commit complements 769996c0cd4cb68c157e39de725642f209ed7423 and adds tests for the following problems introduced by f11aabdc9fec593c31e6c4f3fa25c1707e9c35df: Given the symlink 'dirlink' pointing to an existing dir, then - filelib:is_regular("dirlink") -> false - filelib:is_dir("dirlink") -> false Given the symlink 'filelink' pointing to an existing file, then - filelib:is_regular("filelink") -> false - filelib:is_file("filelink") -> false - filelib:last_modified("filelink") and filelib:filesize("filelink") return the info of the link and not the file Given the symlink "broken_symlink" pointing to a non-existing file, then - filelib:wildcard("broken_symlink",File) -> []
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-09Merge branch 'weisslj/disksup-posix-only' into maintBruce Yinhe
OTP-12053 * weisslj/disksup-posix-only: Add 'disksup_posix_only' parameter to disksup