aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-14Merge branch 'maint'Zandra
2015-12-14Merge branch 'zandra/fix-snmp-appup' into maintZandra
* zandra/fix-snmp-appup: correct the snmp app up file
2015-12-14Merge branch 'maint'Henrik Nord
2015-12-14Update preloaded modulesHenrik Nord
2015-12-14Update primary bootstrapHenrik Nord
2015-12-14Merge branch 'maint'Dan Gudmundsson
* maint: wx: Revert part of 617387025b698c
2015-12-14Merge branch 'dgud/wx/fix-observer-display' into maintDan Gudmundsson
* dgud/wx/fix-observer-display: wx: Revert part of 617387025b698c
2015-12-14Merge branch 'maint'Ingela Anderton Andin
2015-12-14Merge branch 'ia/pr/919/OTP-13189' into maintIngela Anderton Andin
* ia/pr/919/OTP-13189: ssl: fix hibernate_after with instant or near instant timeouts
2015-12-12wx: Revert part of 617387025b698cDan Gudmundsson
Causes issues on mac and observer
2015-12-11Merge branch 'sverk/setnode-rename-bug/OTP-13076' into maintSverker Eriksson
* sverk/setnode-rename-bug/OTP-13076: erts: Fix correct node name for DTRACE
2015-12-11erts: Fix correct node name for DTRACESverker Eriksson
broken by 949de78331b9c4ecb9.
2015-12-11ssl: fix hibernate_after with instant or near instant timeoutsAndrey Mayorov
2015-12-11Merge branch 'maint'Sverker Eriksson
2015-12-11Merge branch 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson
* sverk/dist-ctrl-msg-overflow: erts: Fix faulty cleanup when receiving broken dist msg
2015-12-11Merge branch 'maint'Siri Hansen
2015-12-11erts: Fix faulty cleanup when receiving broken dist msgSverker Eriksson
Bug introduced in ce8279d6a48d41f9. Thank you valgrind.
2015-12-11Merge branch 'siri/sasl/doc-editors/OTP-13000' into maintSiri Hansen
* siri/sasl/doc-editors/OTP-13000: sasl: Editorial changes
2015-12-11correct the snmp app up fileZandra
2015-12-11Merge branch 'maint'Ingela Anderton Andin
2015-12-11Merge branch 'ia/ssl/ECC-tests' into maintIngela Anderton Andin
* ia/ssl/ECC-tests: ssl: Fix typos
2015-12-11ssl: Fix typosIngela Anderton Andin
2015-12-11Merge branch 'maint'Ingela Anderton Andin
2015-12-11Merge branch 'ia/ssl/windows-tests' into maintIngela Anderton Andin
* ia/ssl/windows-tests: ssl: Use test case time out instead ssl: Use spawn_executable
2015-12-11Merge branch 'ia/ssl/renegotiate-tests' into maintIngela Anderton Andin
* ia/ssl/renegotiate-tests: ssl: Add renegotiation exception
2015-12-11Merge branch 'maint'Lars Thorsen
2015-12-11Merge branch 'lars/correct-doc-bugs' into maintLars Thorsen
2015-12-11[inets] Correct broken linksLars Thorsen
2015-12-11[orber] Align documentation to DTDLars Thorsen
2015-12-11[inets] Align documentation to DTDLars Thorsen
2015-12-11[ssl] Moved description details to man(6) pageLars Thorsen
2015-12-11[ssh] Align documentation to DTDLars Thorsen
2015-12-11[ssl] Correct the documentation so it follows the DTDLars Thorsen
2015-12-11Merge branch 'maint'Lars Thorsen
2015-12-11Merge branch 'lars/erl_docgen/fix-dtd-tags' into maintLars Thorsen
* lars/erl_docgen/fix-dtd-tags: [erl_docgen] Update element section in DTD [erl_docgen] Update element d in DTD [erl_docgen] Update item element in DTD
2015-12-11[erl_docgen] Update element section in DTDLars Thorsen
Allow sections in sections for reference manuals.
2015-12-11[erl_docgen] Update element d in DTDLars Thorsen
Allow seealso in the d element
2015-12-11[erl_docgen] Update item element in DTDLars Thorsen
Allow note, warning, do, dont in item element.
2015-12-11Merge branch 'maint'Peter Andersson
2015-12-11Merge branch 'peppe/common_test/priv_dir_mode_bug' into maintPeter Andersson
* peppe/common_test/priv_dir_mode_bug: Make sure priv_dir names don't cause name clashes OTP-13181
2015-12-11Merge branch 'peppe/common_test/exit_status_when_missing_suites' into maintPeter Andersson
* peppe/common_test/exit_status_when_missing_suites: Let missing suites affect ct:run_test/1 return and ct_run exit status Make abort_if_missing_suites option work in all io modes OTP-13173
2015-12-10Merge branch 'sverk/hash-thresholds'Sverker Eriksson
* sverk/hash-thresholds: erts: Remove unused include files from hash.c erts: Redesign grow/shrink thresholds of hash.c erts: Remove dead code erts_hash_merge
2015-12-10Merge branch 'sverk/crypto-evp-master'Sverker Eriksson
OTP-12217 * sverk/crypto-evp-master: crypto: Avoid bug in OpenSSL-0.9.8 for ECB ciphers Fix EVP_aes_???_ctr to demand OpenSSL 1.0.1 or later. Fix bug for aes_cfb_128_encrypt with empty binary crypto: Refactor nif code to use EVP interface
2015-12-10Let missing suites affect ct:run_test/1 return and ct_run exit statusPeter Andersson
2015-12-10sasl: Editorial changesxsipewe
2015-12-09Merge branch 'maint'Sverker Eriksson
2015-12-09Merge branch 'sverk/dist-ctrl-msg-overflow-master' into masterSverker Eriksson
* sverk/dist-ctrl-msg-overflow-master: erts: Tweak hashmap heap size estimation erts: Fix bug for remote control message containing fat maps erts: Add test for remote exit signal with fat map erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS mode
2015-12-09Merge branch 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson
OTP-13146 (more stuff) * sverk/dist-ctrl-msg-overflow: erts: Tweak hashmap heap size estimation erts: Fix bug for remote control message containing fat maps erts: Add test for remote exit signal with fat map erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS mode
2015-12-09Merge branch 'maint'Hans Nilsson
2015-12-09Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: more info from failed case
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 08:59:25 +0000