aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-10-24Merge branch 'maint'Dan Gudmundsson
* maint: Fix whitespace setting in test files Avoid some error reports when stopping mnesia wx: Improve error handling Fix all whitespace-related issues in erlang.el mnesia: Fix double blocked tables which could cause a crash wx: Add wxWindow:getContentScaleFactor
2016-10-24Merge branch 'dgud/wx/scale-factor' into maintDan Gudmundsson
* dgud/wx/scale-factor: wx: Improve error handling wx: Add wxWindow:getContentScaleFactor
2016-10-24Merge branch 'dgud/mnesia/fix-blocked/OTP-13970' into maintDan Gudmundsson
* dgud/mnesia/fix-blocked/OTP-13970: Avoid some error reports when stopping mnesia mnesia: Fix double blocked tables which could cause a crash
2016-10-24Merge branch 'dgud/tools/emacs/prefer-space/ERL-1200' into maintDan Gudmundsson
* dgud/tools/emacs/prefer-space/ERL-1200: Fix whitespace setting in test files Fix all whitespace-related issues in erlang.el
2016-10-24Fix whitespace setting in test filesDan Gudmundsson
Continuation of the previous commit on test files, which gave whitespace diffs for tabs vs spaces depending on personal settings. And we want to encourage space instead of tabs.
2016-10-24Merge branch 'maint'Björn-Egil Dahlberg
2016-10-24Merge branch 'egil/erl_interface/doc-update/OTP-13980' into maintBjörn-Egil Dahlberg
* egil/erl_interface/doc-update/OTP-13980: erl_interface: Remove CDATA tag except for example code erl_interface: Remove unused file erl_interface: Fix broken links in documentation erl_interface: Fix xmllint problems erl_interface: Fix editorial changes erl_interface: Editorial changes erl_interface: Refactor documentation
2016-10-24erl_interface: Remove CDATA tag except for example codeBjörn-Egil Dahlberg
2016-10-24erl_interface: Remove unused fileBjörn-Egil Dahlberg
2016-10-24erl_interface: Fix broken links in documentationBjörn-Egil Dahlberg
2016-10-24erl_interface: Fix xmllint problemsBjörn-Egil Dahlberg
2016-10-24erl_interface: Fix editorial changesBjörn-Egil Dahlberg
2016-10-21Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Fix error handling of bad -dialyzer() attributes
2016-10-21Merge branch 'fishcakez/dialyzer/fix_attribute_bug/ERL-283/OTP-13979' into maintHans Bolinder
* fishcakez/dialyzer/fix_attribute_bug/ERL-283/OTP-13979: dialyzer: Fix error handling of bad -dialyzer() attributes
2016-10-21dialyzer: Fix error handling of bad -dialyzer() attributesHans Bolinder
If a dialyzer module attribute references an undefined (local) function an error tuple is thrown but no caught. This leads to a 'nocatch' error and not the intended "clean" error.
2016-10-20Merge branch 'kostis/hipe_bifs-add_ref/PR-1205'Sverker Eriksson
2016-10-20Merge branch 'maint'Sverker Eriksson
2016-10-20Merge branch 'sverker/ei_connect_xinit/PR-1202/OTP-13981' into maintSverker Eriksson
* sverker/ei_connect_xinit/PR-1202: use only two low bits of creation
2016-10-20erl_interface: Editorial changesxsipewe
2016-10-20erl_interface: Refactor documentationBjörn-Egil Dahlberg
2016-10-19Merge branch 'maint'Hans Bolinder
* maint: dbg:fun2ms: allow empty list as head
2016-10-19Merge branch 'gomoripeti/stdlib/ms_fix/PR-1203/OTP-13974' into maintHans Bolinder
* gomoripeti/stdlib/ms_fix/PR-1203/OTP-13974: dbg:fun2ms: allow empty list as head
2016-10-19Merge branch 'maint'Raimo Niskanen
2016-10-19Merge branch 'raimo/gen_statem-improvements/OTP-13929' into maintRaimo Niskanen
* raimo/gen_statem-improvements/OTP-13929: Fix race condition in cancel_timer/1 Use parameterized types Implement state timeouts Improve docs and types Change state entry events into state enter calls Improve docs Improve docs Implement state entry events Implement call/3 dirty_timeout
2016-10-19Merge branch ↵Raimo Niskanen
'raimo/erts/fix-configure-to-check-in-libsct-for-sctp-funcs/ERL-262/OTP-13956' into maint * raimo/erts/fix-configure-to-check-in-libsct-for-sctp-funcs/ERL-262/OTP-13956: Configure enable libsctp dependency Revert "Check libsctp for sctp funcs in configure.in"
2016-10-19Merge branch 'gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976'Lukas Larsson
* gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976: erts: Fix some system_info docs inconsistencies Add system_info(atom_limit)
2016-10-18Restore the erroneously taken out assertionKostis Sagonas
2016-10-18Merge branch 'maint'Hans Nilsson
2016-10-18Merge branch 'hans/inets/ftp_multiline_resp/PR-1196/OTP-13960' into maintHans Nilsson
2016-10-18Merge branch 'hans/inets/ftp_locks/OTP-13967' into maintHans Nilsson
2016-10-18Code cleanup to remove confusing assertionKostis Sagonas
The code of add_ref/6 contained an assertion that somehow appeared twice. Also, a recent commit (2b2de61) suppressed an unmatched return warning in a non-optimal way. By changing the return type of hipe_bifs:add_ref/2 to be 'ok' instead of [] the code can be cleaned up and simplified. While at it, fixed the wrong indentation of some nearby code.
2016-10-18Change the return type of hipe_bifs:add_ref/2Kostis Sagonas
2016-10-18Merge branch 'maint'Hans Nilsson
Conflicts: OTP_VERSION
2016-10-18Merge branch 'maint-19' into maintHans Nilsson
2016-10-18Merge branch 'maint'Lukas Larsson
2016-10-18Merge branch 'lukas/erts/etp-disasm' into maintLukas Larsson
* lukas/erts/etp-disasm: erts: Add etp-disasm gdb macro
2016-10-18erts: Add etp-disasm gdb macroLukas Larsson
2016-10-17Updated OTP versionOTP-19.1.5Erlang/OTP
2016-10-17Prepare releaseErlang/OTP
2016-10-17Merge branch 'hans/ssh/rekey_problem/OTP-13972' into maint-19Erlang/OTP
* hans/ssh/rekey_problem/OTP-13972: ssh: fix renegotiation problem ssh: test case for renegotiation with openssh client
2016-10-17ssh: fix renegotiation problemHans Nilsson
2016-10-17ssh: test case for renegotiation with openssh clientHans Nilsson
2016-10-17Merge branch 'maint'Björn-Egil Dahlberg
2016-10-17Merge branch 'egil/erl_docgen/reformat-docgen-encoding/OTP-13971' into maintBjörn-Egil Dahlberg
* egil/erl_docgen/reformat-docgen-encoding/OTP-13971: Reformat docgen xml encoding
2016-10-17Avoid some error reports when stopping mnesiaDan Gudmundsson
Worker processes can cause error reports if the main mnesia processes dissapear.
2016-10-17wx: Improve error handlingDan Gudmundsson
Fix error handling in gl as in wx.
2016-10-17Merge branch 'sverker/hipe-code-loadnpurge/OTP-13968'Sverker Eriksson
* sverker/hipe-code-loadnpurge: (35 commits) erts: Cleanup dead code kernel,hipe: Fix dialyzer warnings erts: Replace unsafe Module.first_hipe_ref erts: Disable DBG_TRACE_MFA for debug build kernel: Fix code_SUITE:upgrade for non-hipe erts: Cleanup hipe trampoline code erts: Remove dead alloc stats in hipe_amd64.c erts: Remove code_SUITE:make_stub and make_stub_many_funs erts: Let code:make_stub_module raise 'notsup' erts: Fix bug in stack walk on risc erts: Fix old leak for ppc hipe code erts: Fix old leak for arm hipe code erts: Fix old leak of sparc hipe code erts: Fix old leak of hipe code on x86 32-bit erts: Enable exec_alloc for all hipe architectures erts: Remove debug printout for hipe loader state erts: Free hipe_refs and hipe_sdesc of a failed load erts: Refactor out hipe_purge_refs/sdesc erts: Refactor hipe_loader_state_dtor into a true destructor hipe: TRY fix llvm external calls to own module ...
2016-10-17erts: Cleanup dead codeSverker Eriksson
2016-10-17kernel,hipe: Fix dialyzer warningsSverker Eriksson
2016-10-17Configure enable libsctp dependencyRaimo Niskanen