aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-12-07Merge branch 'rickard/garbage_collect/OTP-11388'Rickard Green
* rickard/garbage_collect/OTP-11388: Parallel check_process_code when code_server purge a module Functionality for disabling garbage collection Use asynchronous check_process_code in code_parallel_SUITE Execution of system tasks in context of another process Conflicts: bootstrap/lib/kernel/ebin/hipe_unified_loader.beam erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam
2013-12-06Update preloaded modulesMagnus Lidén
2013-12-06Merge branch 'maint'Magnus Lidén
2013-12-06Update primary bootstrap app- and appup filesMagnus Lidén
2013-12-06Update primary bootstrapMagnus Lidén
2013-12-05Merge branch 'maint'Raimo Niskanen
2013-12-05Merge branch 'schlagert/fix_emulator_upgrades' into maintRaimo Niskanen
* schlagert/fix_emulator_upgrades: Fix boot file generation for intermediate releases.
2013-12-05Merge branch 'maint'Hans Nilsson
2013-12-05Merge branch 'hans/inets/ftpc_test_fail' into maintHans Nilsson
* hans/inets/ftpc_test_fail: inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
2013-12-05inets: Restore ftp test files for the inets_{,sup_}SUITE to not failHans Nilsson
2013-12-05Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-12-05Merge branch 'ia/inets/cuddle-with-tests' into maintIngela Anderton Andin
* ia/inets/cuddle-with-tests: inets: Add crypto start check to ssl test cases
2013-12-05Update primary bootstrapSverker Eriksson
2013-12-04Merge branch 'maint'Peter Andersson
2013-12-04Merge branch 'peppe/common_test/r16b03_docs_updated' into maintPeter Andersson
* peppe/common_test/r16b03_docs_updated: Update event handling documentation OTP-11524
2013-12-04Update event handling documentationPeter Andersson
2013-12-04Merge branch 'sverk/crypto-strrchr-bug'Sverker Eriksson
* sverk/crypto-strrchr-bug: crypto: Fix bug in change_basename
2013-12-04Merge branch 'maint'Peter Andersson
2013-12-04Merge branch 'peppe/common_test/r16b03_docs' into maintPeter Andersson
* peppe/common_test/r16b03_docs: Update documentation OTP-10631 OTP-11305 OTP-11523 OTP-11524
2013-12-04Merge branch 'maint'Anders Svensson
2013-12-04Merge branch 'anders/diameter/doc/OTP-11519' into maintAnders Svensson
* anders/diameter/doc/OTP-11519: Assorted doc fixes/tweaks
2013-12-03Update documentationPeter Andersson
2013-12-03crypto: Fix bug in change_basenameSverker Eriksson
strrchr used on non null-terminated string.
2013-12-03Merge branch 'sverk/yb/aes_ige_crypt'Sverker Eriksson
* sverk/yb/aes_ige_crypt: crypto: Update supports/0 for des3_cbf and aes_ige256 crypto: Throw notsup for AES IGE if openssl older than 0.9.8c crypto: Add IGE mode for AES OTP-11522
2013-12-03Assorted doc fixes/tweaksAnders Svensson
2013-12-03Merge branch 'maint'Hans Nilsson
2013-12-03Merge branch 'hans/ssh/cli_delays' into maintHans Nilsson
* hans/ssh/cli_delays: ssh: Fix long cli delays. (Part of OTP-11339, OTP-10953)
2013-12-03Merge branch 'hans/ftp/dialyzer_warning' into maintHans Nilsson
* hans/ftp/dialyzer_warning: ftp: fix sockname dialyzer warning including ftp:sockname/1 bug
2013-12-03ftp: fix sockname dialyzer warning including ftp:sockname/1 bugHans Nilsson
2013-12-03ssh: Fix long cli delays. (Part of OTP-11339, OTP-10953)Hans Nilsson
A step in fixing the tickets.
2013-12-03Merge branch 'maint'Sverker Eriksson
2013-12-03Merge branch 'sverk/crypto-no_answer_from_tc_supervisor' into maintSverker Eriksson
* sverk/crypto-no_answer_from_tc_supervisor: crypto: Add more lazy_eval to avoid no_answer_from_tc_supervisor
2013-12-03Fix boot file generation for intermediate releases.Tobias Schlager
A previous refactoring messed up the paths used in the start.boot file used in intermediate releases generated for emulator upgrades.
2013-12-03Merge branch 'maint'Björn-Egil Dahlberg
2013-12-03Merge branch 'egil/fix-darwin-64-configure-default/OTP-11521' into maintBjörn-Egil Dahlberg
* egil/fix-darwin-64-configure-default/OTP-11521: erts: Let cc determine default wordsize for darwin build
2013-12-03Merge branch 'maint'Peter Andersson
2013-12-03Merge branch 'peppe/common_test/hook_skip_failure' into maintPeter Andersson
* peppe/common_test/hook_skip_failure: Fix CT hook pre_end_per_group causing crash when returning {skip,Reason} OTP-11409
2013-12-03inets: Add crypto start check to ssl test casesIngela Anderton Andin
2013-12-03Merge branch 'maint'Sverker Eriksson
2013-12-03Merge branch 'sverk/test-cuddle' into maintSverker Eriksson
* sverk/test-cuddle: erts: Reduce wasted execution time for match_spec_SUITE:otp_9422
2013-12-03Merge branch 'maint'Rickard Green
* maint: Fix observer retrieval of alloc info
2013-12-03Merge branch 'rickard/alloc-info/OTP-11520' into maintRickard Green
* rickard/alloc-info/OTP-11520: Fix observer retrieval of alloc info
2013-12-03Fix observer retrieval of alloc infoRickard Green
This commit only bump the runtime_tools version. The actual fix is in commit 6cd261deb5fec413eb196b620a4618cfa0781458 (merged to maint branch), but should have been part of this commit.
2013-12-02erts: Reduce wasted execution time for match_spec_SUITE:otp_9422Sverker Eriksson
2013-12-02Merge branch 'maint'Rickard Green
* maint: Documentation fix
2013-12-02Merge branch 'rickard/supercarrier-fix/OTP-11149' into maintRickard Green
* rickard/supercarrier-fix/OTP-11149: Documentation fix
2013-12-02Documentation fixRickard Green
2013-12-02Merge branch 'maint'Henrik Nord
2013-12-02Merge branch 'nox/crypto-uninitialized-vars' into maintHenrik Nord
* nox/crypto-uninitialized-vars: Fix some uninitialized pointers in crypto OTP-11510
2013-12-02Merge branch 'nox/fix-clang-warnings' into maintHenrik Nord
* nox/fix-clang-warnings: Silence warnings about socklen_t pointers sign in erl_memory Compile in_heapfrag() only in debug mode Silence two warnings about tests being always true Conditionally compile my_gethostbyname_r and my_gethostbyaddr_r Silence a mismatching type pointer warning in ei_resolve Silence warnings about different buffer types in erl_memory erts: Remove unused file winsock_func.h Silence warnings about unused return values in ic Silence a warning in erl_poll about an empty loop body Fix erts_check_off_heap2 assertion Properly mark erl_assert_error as non-returning Remove uninitialized use of new_crr in erl_alloc_util OTP-11517