Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-12-05 | Merge branch 'maint' | Raimo Niskanen | |
2013-12-05 | Merge branch 'schlagert/fix_emulator_upgrades' into maint | Raimo Niskanen | |
* schlagert/fix_emulator_upgrades: Fix boot file generation for intermediate releases. | |||
2013-12-05 | Merge branch 'maint' | Hans Nilsson | |
2013-12-05 | Merge branch 'hans/inets/ftpc_test_fail' into maint | Hans Nilsson | |
* hans/inets/ftpc_test_fail: inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail | |||
2013-12-05 | inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail | Hans Nilsson | |
2013-12-05 | Merge remote-tracking branch 'upstream/maint' | Ingela Anderton Andin | |
2013-12-05 | Merge branch 'ia/inets/cuddle-with-tests' into maint | Ingela Anderton Andin | |
* ia/inets/cuddle-with-tests: inets: Add crypto start check to ssl test cases | |||
2013-12-05 | Update primary bootstrap | Sverker Eriksson | |
2013-12-04 | Merge branch 'maint' | Peter Andersson | |
2013-12-04 | Merge branch 'peppe/common_test/r16b03_docs_updated' into maint | Peter Andersson | |
* peppe/common_test/r16b03_docs_updated: Update event handling documentation OTP-11524 | |||
2013-12-04 | Update event handling documentation | Peter Andersson | |
2013-12-04 | Merge branch 'sverk/crypto-strrchr-bug' | Sverker Eriksson | |
* sverk/crypto-strrchr-bug: crypto: Fix bug in change_basename | |||
2013-12-04 | Merge branch 'maint' | Peter Andersson | |
2013-12-04 | Merge branch 'peppe/common_test/r16b03_docs' into maint | Peter Andersson | |
* peppe/common_test/r16b03_docs: Update documentation OTP-10631 OTP-11305 OTP-11523 OTP-11524 | |||
2013-12-04 | Merge branch 'maint' | Anders Svensson | |
2013-12-04 | Merge branch 'anders/diameter/doc/OTP-11519' into maint | Anders Svensson | |
* anders/diameter/doc/OTP-11519: Assorted doc fixes/tweaks | |||
2013-12-03 | Update documentation | Peter Andersson | |
2013-12-03 | crypto: Fix bug in change_basename | Sverker Eriksson | |
strrchr used on non null-terminated string. | |||
2013-12-03 | Merge 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-03 | Assorted doc fixes/tweaks | Anders Svensson | |
2013-12-03 | Merge branch 'maint' | Hans Nilsson | |
2013-12-03 | Merge branch 'hans/ssh/cli_delays' into maint | Hans Nilsson | |
* hans/ssh/cli_delays: ssh: Fix long cli delays. (Part of OTP-11339, OTP-10953) | |||
2013-12-03 | Merge branch 'hans/ftp/dialyzer_warning' into maint | Hans Nilsson | |
* hans/ftp/dialyzer_warning: ftp: fix sockname dialyzer warning including ftp:sockname/1 bug | |||
2013-12-03 | ftp: fix sockname dialyzer warning including ftp:sockname/1 bug | Hans Nilsson | |
2013-12-03 | ssh: Fix long cli delays. (Part of OTP-11339, OTP-10953) | Hans Nilsson | |
A step in fixing the tickets. | |||
2013-12-03 | Merge branch 'maint' | Sverker Eriksson | |
2013-12-03 | Merge branch 'sverk/crypto-no_answer_from_tc_supervisor' into maint | Sverker Eriksson | |
* sverk/crypto-no_answer_from_tc_supervisor: crypto: Add more lazy_eval to avoid no_answer_from_tc_supervisor | |||
2013-12-03 | Fix 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-03 | Merge branch 'maint' | Björn-Egil Dahlberg | |
2013-12-03 | Merge branch 'egil/fix-darwin-64-configure-default/OTP-11521' into maint | Björn-Egil Dahlberg | |
* egil/fix-darwin-64-configure-default/OTP-11521: erts: Let cc determine default wordsize for darwin build | |||
2013-12-03 | Merge branch 'maint' | Peter Andersson | |
2013-12-03 | Merge branch 'peppe/common_test/hook_skip_failure' into maint | Peter Andersson | |
* peppe/common_test/hook_skip_failure: Fix CT hook pre_end_per_group causing crash when returning {skip,Reason} OTP-11409 | |||
2013-12-03 | inets: Add crypto start check to ssl test cases | Ingela Anderton Andin | |
2013-12-03 | Merge branch 'maint' | Sverker Eriksson | |
2013-12-03 | Merge branch 'sverk/test-cuddle' into maint | Sverker Eriksson | |
* sverk/test-cuddle: erts: Reduce wasted execution time for match_spec_SUITE:otp_9422 | |||
2013-12-03 | Merge branch 'maint' | Rickard Green | |
* maint: Fix observer retrieval of alloc info | |||
2013-12-03 | Merge branch 'rickard/alloc-info/OTP-11520' into maint | Rickard Green | |
* rickard/alloc-info/OTP-11520: Fix observer retrieval of alloc info | |||
2013-12-03 | Fix observer retrieval of alloc info | Rickard 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-02 | erts: Reduce wasted execution time for match_spec_SUITE:otp_9422 | Sverker Eriksson | |
2013-12-02 | Merge branch 'maint' | Rickard Green | |
* maint: Documentation fix | |||
2013-12-02 | Merge branch 'rickard/supercarrier-fix/OTP-11149' into maint | Rickard Green | |
* rickard/supercarrier-fix/OTP-11149: Documentation fix | |||
2013-12-02 | Documentation fix | Rickard Green | |
2013-12-02 | Merge branch 'maint' | Henrik Nord | |
2013-12-02 | Merge branch 'nox/crypto-uninitialized-vars' into maint | Henrik Nord | |
* nox/crypto-uninitialized-vars: Fix some uninitialized pointers in crypto OTP-11510 | |||
2013-12-02 | Merge branch 'nox/fix-clang-warnings' into maint | Henrik 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 | |||
2013-12-02 | Merge branch 'nox/diameter-make-fixes' into maint | Henrik Nord | |
* nox/diameter-make-fixes: diameter: Fix silent make rule OTP-11514 | |||
2013-12-02 | Merge branch 'nox/wx-make-fixes' into maint | Henrik Nord | |
* nox/wx-make-fixes: wx: Fix silent make rules OTP-11515 | |||
2013-12-02 | Merge branch 'nox/eunit-make-fix' into maint | Henrik Nord | |
* nox/eunit-make-fix: eunit: Fix silent make rule OTP-11516 | |||
2013-12-02 | diameter: Fix silent make rule | Anthony Ramine | |
2013-12-02 | eunit: Fix silent make rule | Anthony Ramine | |