aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-11-06Add test of maps in supervisor flags and child specsSiri Hansen
2014-11-06Merge branch 'maint'Marcus Arendt
2014-11-06Merge branch 'vinoski/fix-smp-disable-with-ds/OTP-12295' into maintMarcus Arendt
* vinoski/fix-smp-disable-with-ds/OTP-12295: Fix "-smp disable" for emulator with dirty schedulers
2014-11-06Merge branch 'maint'Bruce Yinhe
2014-11-06Merge branch 'dcy/maint' into maintBruce Yinhe
* dcy/maint: fix doc for maps:with/2
2014-11-05Merge branch 'lukas/erts/crash_dump_shell_info/OTP-12292'Lukas Larsson
* lukas/erts/crash_dump_shell_info/OTP-12292: erts: Print that we are crashdumping earlier
2014-11-05Merge branch 'maint'Lukas Larsson
* maint: erts: Fix hanging in fd_stop on windows
2014-11-05Merge branch 'lukas/erts/win32-flush-block/OTP-12291' into maintLukas Larsson
* lukas/erts/win32-flush-block/OTP-12291: erts: Fix hanging in fd_stop on windows
2014-11-05Merge branch 'maint'Marcus Arendt
Conflicts: erts/vsn.mk
2014-11-05Merge branch 'maint-17' into maintMarcus Arendt
Conflicts: OTP_VERSION
2014-11-05Merge branch 'maint'Lukas Larsson
* maint: erts: Fix ub in list_to_integer and bignum div
2014-11-05Merge branch 'lukas/erts/fix_undefined_behaviour/OTP-12290' into maintLukas Larsson
* lukas/erts/fix_undefined_behaviour/OTP-12290: erts: Fix ub in list_to_integer and bignum div
2014-11-05Merge branch 'maint'Lukas Larsson
* maint: erts: getsockname is not allowed on non-bound sockets
2014-11-05Merge branch 'lukas/erts/fdopen_non_bound_win32_fix/OTP-12289' into maintLukas Larsson
* lukas/erts/fdopen_non_bound_win32_fix/OTP-12289: erts: getsockname is not allowed on non-bound sockets
2014-11-05Update test_server app filePeter Andersson
2014-11-05Section reference number incorrectjmrepetti
2014-11-04Merge branch 'rickard/activate-runq/OTP-12287' into ↵Rickard Green
rickard/maint-17/activate-runq/OTP-12287 * rickard/activate-runq/OTP-12287: Do not let non-empty run-queue prevent activation of scheduler Conflicts: erts/emulator/beam/erl_process.c
2014-11-04Do not let non-empty run-queue prevent activation of schedulerRickard Green
Conflicts: erts/emulator/beam/erl_process.c
2014-11-04Fix gc-related problem with dirty NIFsSteve Vinoski
Ensure that the return value from a dirty NIF call is made part of the GC rootset. Add a new regression test to nif_SUITE. Thanks to Daniel Goertzen for reporting the error and providing a test case, and to Sverker Eriksson for making test case reproducible and finding the fix.
2014-11-04Merge branch 'maint'Ingela Anderton Andin
2014-11-04Merge branch 'ia/ssh/rekeying-typo/OTP-12277' into maintIngela Anderton Andin
* ia/ssh/rekeying-typo/OTP-12277: ssh: Correct typo of renegotiate that could cause rekeying to fail
2014-11-04Updated OTP versionOTP-17.3.4Erlang/OTP
2014-11-04Prepare releaseErlang/OTP
2014-11-04Merge branch 'sverk/cpool_fetch-dc_list-bug/OTP-12249' into maint-17Erlang/OTP
* sverk/cpool_fetch-dc_list-bug/OTP-12249: erts: Fix bug when delayed deallocated carrier is reused by cpool_fetch
2014-11-04Merge branch 'sverk/run_erl-winsize-fix/OTP-12275' into maint-17Erlang/OTP
* sverk/run_erl-winsize-fix/OTP-12275: erts: Mend run_erl to set windows size of terminal sent from to_erl
2014-11-04fix doc for maps:with/2dcy
2014-11-04Merge branch 'maint'Bruce Yinhe
2014-11-04Merge branch 'brigadier/patch-1' into maintBruce Yinhe
* brigadier/patch-1: fix small typo in processes.xml
2014-11-04Merge branch 'maint'Bruce Yinhe
2014-11-04Merge branch 'davidw/add-spec-skel' into maintBruce Yinhe
OTP-12283 * davidw/add-spec-skel: Removed extra space following paren First attempt at adding a skel for -spec's
2014-11-03Merge branch 'maint'Sverker Eriksson
2014-11-03Merge branch 'sverk/beam-ranges-bug/OTP-12273' into maintSverker Eriksson
* sverk/beam-ranges-bug/OTP-12273: erts: Fix bug in beam_ranges
2014-11-03Merge branch 'sverk/yielding-distr-send/OTP-12232'Sverker Eriksson
* sverk/yielding-distr-send/OTP-12232: erts: Add constant TERM_TO_BINARY_MEMCPY_FACTOR erts: Optimize some repeated calls to {E,W}STACK_PUSH erts: Yield in term_to_binary when encoding big maps erts: Remove unnecessary goto for fun encoding erts: Yield in term_to_binary while copying large binaries erts: Implement yielding for distributed send of large messages
2014-11-03erts: Add constant TERM_TO_BINARY_MEMCPY_FACTORSverker Eriksson
and do not piggyback on B2T_MEMCPY_FACTOR
2014-11-03Merge branch 'danielwhite/eldap-password-modify/OTP-12282'Marcus Arendt
* danielwhite/eldap-password-modify/OTP-12282: eldap: Add support for modifying passwords
2014-11-03Removed extra space following parenDavid N. Welton
2014-11-03fix small typo in processes.xmlEvgeny M
kilo_byte() -> is kilo_byte/0 not kilo_byte/1
2014-11-02Expose NIF versionPeter Lemenkov
This patch allows checking for NIF API version in a way similar to driver version. E.g. by calling erlang:system_info(nif_version). Signed-off-by: Peter Lemenkov <[email protected]>
2014-10-31Merge branch 'maint'Bruce Yinhe
2014-10-31Merge branch 'tuncer/configure.in-bashism' into maintBruce Yinhe
OTP-12280 * tuncer/configure.in-bashism: configure.in: fix test == bashism
2014-10-31Merge branch 'maint'Bruce Yinhe
2014-10-31Merge branch 's1n4/mnesia_doc_typo' into maintBruce Yinhe
OTP-12278 * s1n4/mnesia_doc_typo: Fix a typo in the mnesia documentation
2014-10-30Merge branch 'maint'Ingela Anderton Andin
2014-10-30Merge branch 'ia/ssh/pty-request/OTP-11542' into maintIngela Anderton Andin
* ia/ssh/pty-request/OTP-11542: ssh: Add basic ptty_alloc tests ssh: Add pty_alloc request to ssh:shell/[1,2,3] ssh: Add ptty_alloc/[2,3]
2014-10-30ssh: Correct typo of renegotiate that could cause rekeying to failIngela Anderton Andin
2014-10-30Merge branch 'maint'Marcus Arendt
2014-10-30Merge branch 'ollema/wx_object-emacs-skeleton' into maintMarcus Arendt
* ollema/wx_object-emacs-skeleton: Add wx_object as emacs skeleton
2014-10-30Merge branch 'nox/rm-raw_files/OTP-12276'Marcus Arendt
* nox/rm-raw_files/OTP-12276: Remove untested option 'raw_files' from file module
2014-10-30erts: Mend run_erl to set windows size of terminal sent from to_erlSverker Eriksson
Need to include sys/ioctl.h for TIOCSWINSZ to be defined. Seems this was broken when refactoring run_erl for OSE in OTP 17.0.
2014-10-30Merge branch 'maint'Hans Nilsson