aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-02Merge branch 'maint'Lukas Larsson
2015-11-02Merge branch 'lukas/erts/win32_bool_fix/OTP-13079' into maintLukas Larsson
* lukas/erts/win32_bool_fix/OTP-13079: erts: bool is a reserved word, use boolean instead
2015-11-02Merge branch 'maint'Lukas Larsson
2015-11-02Merge branch 'lukas/runtime_tools/dbg_stop_docs/OTP-13078' into maintLukas Larsson
* lukas/runtime_tools/dbg_stop_docs/OTP-13078: runtime_tools: Explain that dbg:stop only clears local trace patterns
2015-11-02runtime_tools: Explain that dbg:stop only clears local trace patternsLukas Larsson
2015-11-02Merge branch 'maint'Lukas Larsson
2015-11-02Merge branch 'lukas/erts/process_mem_test_fix/OTP-13077' into maintLukas Larsson
* lukas/erts/process_mem_test_fix/OTP-13077: erts: Don't run processes tests on lcnt with little memory
2015-11-02Merge branch 'maint'Henrik Nord
2015-11-02Merge branch 'henrik/find-redist' into maintHenrik Nord
2015-10-30Merge branch 'hb/hipe/erl_bif_types/OTP-11402'Hans Bolinder
* hb/hipe/erl_bif_types/OTP-11402: hipe/dialyzer: Remove functions from erl_bif_types
2015-10-30hipe/dialyzer: Remove functions from erl_bif_typesHans Bolinder
2015-10-30Merge branch 'bjorn/cuddle-with-tests'Björn Gustavsson
* bjorn/cuddle-with-tests: epp_SUITE: Avoid hard-coding list of macros more than once epp_SUITE: Add smoke and coverage test of format_error/1
2015-10-30Merge branch 'maint'Björn Gustavsson
* maint: beam_lib: Document all_chunks/1 and build_module/1
2015-10-30Merge branch 'bjorn/stdlib/beam_lib-doc/OTP-13063' into maintBjörn Gustavsson
* bjorn/stdlib/beam_lib-doc/OTP-13063: beam_lib: Document all_chunks/1 and build_module/1
2015-10-29epp_SUITE: Avoid hard-coding list of macros more than onceBjörn Gustavsson
2015-10-29epp_SUITE: Add smoke and coverage test of format_error/1Björn Gustavsson
2015-10-29Merge branch 'maint'Hans Nilsson
* maint: ssh: Adjust the test ssh_renegotiate_SUITE:rekey_limit ssh: fix spelling error pulic -> public
2015-10-29Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: Adjust the test ssh_renegotiate_SUITE:rekey_limit ssh: fix spelling error pulic -> public
2015-10-29ssh: Adjust the test ssh_renegotiate_SUITE:rekey_limitHans Nilsson
- Remove random length padding to make the data volume deterministic - Increase data volume limit for re-keying because the kexinit message has grown
2015-10-29ssh: fix spelling error pulic -> publicHans Nilsson
2015-10-28Merge branch 'maint'Hans Nilsson
* maint: ssh: testcases for bad service names
2015-10-28Merge branch 'hans/ssh/handle_bad_service_names/OTP-12791' into maintHans Nilsson
* hans/ssh/handle_bad_service_names/OTP-12791: ssh: testcases for bad service names
2015-10-28ssh: testcases for bad service namesHans Nilsson
2015-10-27Merge branch 'maint'Henrik Nord
2015-10-27Merge branch 'gomoripeti/bindoc_fix' into maintHenrik Nord
* gomoripeti/bindoc_fix: Very minor fixes to binary handling documentation
2015-10-27Merge branch 'lrascao/fix/build_fail_on_enabled_dist_debug' into maintHenrik Nord
* lrascao/fix/build_fail_on_enabled_dist_debug: Fix build fail when enabling distribution debug messages
2015-10-27Merge branch 'scrapinghub/http_uri_scheme_validation' into maintHenrik Nord
* scrapinghub/http_uri_scheme_validation: inets: scheme validation fun for http_uri OTP-13071
2015-10-27Merge branch 'derek121/docs_fop_details' into maintHenrik Nord
* derek121/docs_fop_details: Add details on the FOP formatter
2015-10-27Merge branch 'schlagert/remove_xmerl_xsd_builtin_definitions' into maintHenrik Nord
* schlagert/remove_xmerl_xsd_builtin_definitions: Remove built-in definition of xml.xsd from xmerl OTP-13070
2015-10-27Merge branch 'scrapinghub/obs_folded_headers' into maintHenrik Nord
* scrapinghub/obs_folded_headers: inets: fix suppport of HTTP headers with obs-fold OTP-13069
2015-10-27Merge branch 'lucafavatella/dialyzer-fun-literal-arity' into maintHenrik Nord
* lucafavatella/dialyzer-fun-literal-arity: Teach Dialyzer arity of funs with literal arity OTP-13068
2015-10-27Merge branch 'maint'Dan Gudmundsson
* maint: cdv: Fix crashdump ets table type observer: Show ets owner pid in crashdump viewers ets popup window erts: Detect and build on MSYS2 for windows
2015-10-27Merge branch 'maint'Ingela Anderton Andin
Conflicts: erts/preloaded/ebin/prim_inet.beam
2015-10-27Merge branch 'dgud/observer/cdv-ets-owner/OTP-13030' into maintDan Gudmundsson
* dgud/observer/cdv-ets-owner/OTP-13030: cdv: Fix crashdump ets table type observer: Show ets owner pid in crashdump viewers ets popup window
2015-10-27Merge branch 'dgud/msys2-fixes' into maintDan Gudmundsson
* dgud/msys2-fixes: erts: Detect and build on MSYS2 for windows
2015-10-27cdv: Fix crashdump ets table typeDan Gudmundsson
The type was set in the wrong datastructure.
2015-10-27observer: Show ets owner pid in crashdump viewers ets popup windowDan Gudmundsson
Owner pid was silently ignored. Bug fix supplied on erlang-bugs by Leo Liu.
2015-10-27Merge branch 'preloaded/ia/pr/758/OTP-12837' into maintIngela Anderton Andin
* preloaded/ia/pr/758/OTP-12837: erts: Include test in group so that it is run erts: Clarify documentation erts: Add {line_delimiter, byte()} option to inet:setopts/2
2015-10-26erts: Include test in group so that it is runIngela Anderton Andin
2015-10-26erts: Clarify documentationIngela Anderton Andin
2015-10-26erts: Add {line_delimiter, byte()} option to inet:setopts/2Serge Aleynikov
A new {line_delimiter, byte()} option allows line-oriented TCP-based protocols to use a custom line delimiting character. It is to be used in conjunction with {packet, line}. This option also works with erlang:decode_packet/3 when its first argument is 'line'.
2015-10-26Update primary bootstrapIngela Anderton Andin
2015-10-26Merge branch 'ia/pr/758/OTP-12837' into maintIngela Anderton Andin
* ia/pr/758/OTP-12837: erts: Include test in group so that it is run erts: Clarify documentation erts: Add {line_delimiter, byte()} option to inet:setopts/2
2015-10-26erts: Include test in group so that it is runIngela Anderton Andin
2015-10-26erts: Clarify documentationIngela Anderton Andin
2015-10-26erts: Add {line_delimiter, byte()} option to inet:setopts/2Serge Aleynikov
A new {line_delimiter, byte()} option allows line-oriented TCP-based protocols to use a custom line delimiting character. It is to be used in conjunction with {packet, line}. This option also works with erlang:decode_packet/3 when its first argument is 'line'.
2015-10-22erts: Detect and build on MSYS2 for windowsDan Gudmundsson
Allow building win32 on MSYS2. Avoid msys2 path conversion which does not work. And print the real windows command when something fails.
2015-10-22beam_lib: Document all_chunks/1 and build_module/1Björn Gustavsson
beam_lib:all_chunks/1 and beam_lib:build_module/1 can be useful for special-purpose stripping, for example to remove the "Line" chunk.
2015-10-21Merge branch 'maint'Hans Nilsson
* maint: ssh: dynamic check of supported algos in ssh_to_openssh_SUITE ssh: delete now obsolete test case group 'hardening_tests'
2015-10-21Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: dynamic check of supported algos in ssh_to_openssh_SUITE ssh: delete now obsolete test case group 'hardening_tests'