aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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-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
2014-10-30Merge branch 'hans/eldap/extensible_match_filter/OTP-12174' into maintHans Nilsson
* hans/eldap/extensible_match_filter/OTP-12174: eldap: vsn.mk updated. eldap: extensibleMatch added.
2014-10-30eldap: vsn.mk updated.Hans Nilsson
2014-10-30eldap: extensibleMatch added.Hans Nilsson
2014-10-29Merge branch 'maint'Sverker Eriksson
2014-10-29Merge branch 'sverk/etp-check-beam-ranges' into maintSverker Eriksson
* sverk/etp-check-beam-ranges: erts: Add gdb command etp-check-beam-ranges
2014-10-29erts: Add gdb command etp-check-beam-rangesSverker Eriksson
2014-10-29erts: Fix bug in beam_rangesSverker Eriksson
Symptom: VM on OSX (darwin11.4.2) with +Meamin running sasl tests, crashing when init:reboot() does erlang:purge_module(installer). Problem: Off-by-one bug in beam_ranges:find_range, returning the wrong range if the 'end' of one module is the 'start' of the next. This is only possible if using sys_alloc (+Meamin) as our own allocators always put block headers between allocated payload data.
2014-10-29ssh: Add basic ptty_alloc testsIngela Anderton Andin
2014-10-28Merge branch 'maint'Sverker Eriksson
2014-10-28Merge branch 'sverk/cpool_fetch-dc_list-bug/OTP-12249' into maintSverker Eriksson
* sverk/cpool_fetch-dc_list-bug/OTP-12249: erts: Fix bug when delayed deallocated carrier is reused by cpool_fetch
2014-10-28Merge branch 'egil/nox/maps-match_specs/OTP-12270'Björn-Egil Dahlberg
* egil/nox/maps-match_specs/OTP-12270: erts: Fix return value from erts_maps_get to be const Properly support maps in match_specs Support maps in ms_transform Return pointer to value in erts_maps_get()
2014-10-28Fix a typo in the mnesia documentationSina Samavati
2014-10-28Merge branch 'maint'Lukas Larsson
* maint: erts: Initialize links when reading file info
2014-10-28Merge branch 'lukas/erts/win32-read_file_info-links/OTP-12269' into maintLukas Larsson
* lukas/erts/win32-read_file_info-links/OTP-12269: erts: Initialize links when reading file info
2014-10-28Merge branch 'maint'Lukas Larsson
* maint: Use isfinite() instead of finite() when available