aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-08-25Merge branch 'maint'Peter Andersson
2016-08-25Merge branch 'peppe/debugger_crash/ERL-191/OTP-13756' into maintPeter Andersson
* peppe/debugger_crash/ERL-191/OTP-13756: Make sure exit in non-interpreted code doesn't crash the debugger OTP-13756
2016-08-25Merge branch 'maint'Siri Hansen
2016-08-25Merge branch 'siri/reltool/fix-dialyzer-warnings' into maintSiri Hansen
* siri/reltool/fix-dialyzer-warnings: [reltool] Fix dialyzer warnings introduced by OTP-11993
2016-08-24[reltool] Fix dialyzer warnings introduced by OTP-11993Siri Hansen
2016-08-24Merge branch 'maint'Raimo Niskanen
2016-08-24Merge branch 'raimo/gen_statem-callback_mode/OTP-13752' into maintRaimo Niskanen
* raimo/gen_statem-callback_mode/OTP-13752: Include trap_exit in server skeletons Improve sys debug Handle exceptions in init/1 and callback_mode/0 Clarify error values Doc fixes Rewrite SSH for gen_statem M:callback_mode/0 Rewrite SSL for gen_statem M:callback_mode/0 Rewrite Tools for gen_statem M:callback_mode/0 Rewrite gen_statem docs for M:callback_mode/0 Rewrite gen_statem TCs for M:callback_mode/0 Rewrite gen_statem for M:callback_mode/0
2016-08-22Merge branch 'gomoripeti/syntax_tools/merl-transform/PR-1123/OTP-13755' into ↵Björn Gustavsson
maint * gomoripeti/syntax_tools/merl-transform/PR-1123/OTP-13755: Fix infinite loop in merl_transform
2016-08-22Merge branch 'maint'Lukas Larsson
2016-08-22Merge branch 'lukas/erts/port_monitor_mem_leak/OTP-13818' into maintLukas Larsson
* lukas/erts/port_monitor_mem_leak/OTP-13818: erts: Fix port monitor memory leak
2016-08-22Merge branch 'bjorn/compiler/binary-literal-matching'Björn Gustavsson
* bjorn/compiler/binary-literal-matching: Reinstate optimization of binary literal matching Strengthen test case added in 8b83bc0b
2016-08-22Merge branch 'maint'Ingela Anderton Andin
2016-08-22Merge remote-tracking branch 'github/pr/1144' into maintIngela Anderton Andin
2016-08-22Merge branch 'maint'Ingela Anderton Andin
2016-08-22Merge branch 'ingela/ssl/ssl_npn_hello_SUITE_precondition' into maintIngela Anderton Andin
* ingela/ssl/ssl_npn_hello_SUITE_precondition: ssl: Check precondition for ssl_npn_hello_SUITE
2016-08-21Update httpd.xmlLinus.yuan
corrected some typo
2016-08-19Reinstate optimization of binary literal matchingBjörn Gustavsson
105c5b0071 was reverted in dd1162846e because clauses that were supposed to match would not match. (See 8b83bc0b.) Reintroduce the optimization, but make sure that we only shortcut bs_context_to_binary instructions and not bs_start_match2 instructions.
2016-08-19Strengthen test case added in 8b83bc0bBjörn Gustavsson
Don't only test the case that failed; test it exhaustively.
2016-08-19Merge branch 'maint'Sverker Eriksson
2016-08-19Merge branch 'sverker/net_kernel-setopts/OTP-13564' into maintSverker Eriksson
2016-08-19Merge branch 'maint'Dan Gudmundsson
* maint: wx: Add missing specs
2016-08-19Merge branch 'dgud/wx/broken-links' into maintDan Gudmundsson
* dgud/wx/broken-links: wx: Add missing specs
2016-08-19Merge branch 'maint'Dan Gudmundsson
* maint: Request a larger stacksize for wx thread
2016-08-19Merge branch 'dgud/wx/increase_wx_stacksize' into maintDan Gudmundsson
* dgud/wx/increase_wx_stacksize: Request a larger stacksize for wx thread
2016-08-18ssl: Check precondition for ssl_npn_hello_SUITEIngela Anderton Andin
2016-08-18Include trap_exit in server skeletonsRaimo Niskanen
2016-08-18Improve sys debugRaimo Niskanen
2016-08-17Handle exceptions in init/1 and callback_mode/0Raimo Niskanen
2016-08-17Merge branch 'maint'Lukas Larsson
* maint: Updated OTP version Prepare release erts: Make sure to flush potential exit message
2016-08-17Merge branch 'maint-19' into maintLukas Larsson
* maint-19: Updated OTP version Prepare release erts: Make sure to flush potential exit message
2016-08-17Clarify error valuesRaimo Niskanen
2016-08-16Updated OTP versionOTP-19.0.5Erlang/OTP
2016-08-16Prepare releaseErlang/OTP
2016-08-16Merge branch 'lukas/kernel/os_cmd_fix_exit_message_leak/OTP-13813' into maint-19Erlang/OTP
* lukas/kernel/os_cmd_fix_exit_message_leak/OTP-13813: erts: Make sure to flush potential exit message
2016-08-16erts: Make sure to flush potential exit messageLukas Larsson
2016-08-15Update bootstrapSverker Eriksson
2016-08-15kernel: Document net_kernel:getopts and setoptsSverker Eriksson
2016-08-15kernel: Add erl_distribution_SUITE:setoptsSverker Eriksson
to test net_kernel:setopts and getopts.
2016-08-15kernel: Accept and convert old hs_data recordSverker Eriksson
2016-08-15kernel: Add net_kernel:setopts/2 and getopts/2Sverker Eriksson
2016-08-12Merge branch 'sverker/hipe-performance-algorithms/PR-1124/OTP-13810'Sverker Eriksson
2016-08-12erts: Fix port monitor memory leakLukas Larsson
2016-08-12Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release
2016-08-12Merge branch 'maint-18' into maintRickard Green
* maint-18: Updated OTP version Prepare release Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk otp_versions.table
2016-08-12Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release Avoid segfault when printing slogan after crashdumping Fix race causing lost wakeup on receive-after timeout Conflicts: OTP_VERSION
2016-08-12Merge branch 'maint-19' into maintRickard Green
* maint-19: Updated OTP version Prepare release Avoid segfault when printing slogan after crashdumping Fix race causing lost wakeup on receive-after timeout
2016-08-12Merge branch 'maint'Björn Gustavsson
* maint: asn1_test_lib: Compile ASN.1 modules in parallel Support 'make -j' when compiling ASN.1 modules [ERL-209] Fix ambiguous_catch_try_state inconsistency error
2016-08-12Merge branch 'bjorn/compiler/ambiguous_catch_try_state/ERL-209/OTP-13804' ↵Björn Gustavsson
into maint * bjorn/compiler/ambiguous_catch_try_state/ERL-209/OTP-13804: [ERL-209] Fix ambiguous_catch_try_state inconsistency error
2016-08-12Merge branch 'bjorn/asn1/support-parallel-build/OTP-13624' into maintBjörn Gustavsson
* bjorn/asn1/support-parallel-build/OTP-13624: asn1_test_lib: Compile ASN.1 modules in parallel Support 'make -j' when compiling ASN.1 modules
2016-08-12asn1_test_lib: Compile ASN.1 modules in parallelBjörn Gustavsson
Test that the changes in the previous commit allows us to compile ASN.1 modules in parallel.