aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-15Merge branch 'ia/libressl' into maintIngela Anderton Andin
* ia/libressl: ssl: Print openssl version string ssl: Do not use environment variables in openSSL config file
2015-12-15ssl: Convert all test to use "ssl_test_lib:portable_open_port"Ingela Anderton Andin
2015-12-15Merge branch 'ia/inets/dialyzer-custom' into maintIngela Anderton Andin
* ia/inets/dialyzer-custom: inets: Include behaviour modules in install target inets: Fix dialyzer warning
2015-12-15inets: Include behaviour modules in install targetIngela Anderton Andin
2015-12-15inets: Fix dialyzer warningIngela Anderton Andin
2015-12-14Merge branch 'zandra/update-windows-docs' into maintZandra
* zandra/update-windows-docs: update the howto build and install on windows documentation OTP-13192
2015-12-14update the howto build and install on windows documentationZandra
OTP-13188 ticket for: 192c4a80c7d6fe9949aecb864901c4a3d9549f36
2015-12-14ssl: Print openssl version stringIngela Anderton Andin
2015-12-14Merge branch 'zandra/fix-snmp-appup' into maintZandra
* zandra/fix-snmp-appup: correct the snmp app up file
2015-12-14ssl: Do not use environment variables in openSSL config fileIngela Anderton Andin
LibreSSL does not allow it.
2015-12-14Update preloaded modulesHenrik Nord
2015-12-14Update primary bootstrapHenrik Nord
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 '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 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson
* sverk/dist-ctrl-msg-overflow: erts: Fix faulty cleanup when receiving broken dist msg
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 '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 '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 '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 '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 '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-10Let missing suites affect ct:run_test/1 return and ct_run exit statusPeter Andersson
2015-12-10sasl: Editorial changesxsipewe
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 'hans/ssh/cuddle_tests' into maintHans Nilsson
* hans/ssh/cuddle_tests: ssh: more info from failed case
2015-12-09ssl: Use test case time out insteadIngela Anderton Andin
2015-12-09ssl: Use spawn_executableIngela Anderton Andin
2015-12-09Merge branch 'anders/diameter/18.2/OTP-13180' into maintAnders Svensson
* anders/diameter/18.2/OTP-13180: vsn -> 1.11.1 Update appup for 18.2
2015-12-09Merge branch 'anders/diameter/request_leak/OTP-13137' into maintAnders Svensson
* anders/diameter/request_leak/OTP-13137: Fix request table leak at retransmission Fix request table leak at exit signal
2015-12-09Fix request table leak at retransmissionAnders Svensson
In the case of retranmission, a prepare_retransmit callback could modify End-to-End and/or Hop-by-Hop identifiers so that the resulting diameter_request entry was not removed, since the removal was of entries with the identifiers of the original request. The chances someone doing this in practice are probably minimal.
2015-12-09Fix request table leak at exit signalAnders Svensson
The storing of request records in the ets table diameter_request was wrapped in a try/after so that the latter would unconditionally remove written entries. The problem is that it didn't deal with the process exiting as a result of an exit signal, since this doesn't raise in an exception. Since the process in question applies callbacks to user code, we can potentially be linked to other process and exit as a result. Trapping exits changes the current behaviour of the process, so spawn a monitoring process that cleans up upon reception of 'DOWN'.
2015-12-09[observer] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.