summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'OTP-18.2' into maintHenrik Nord2015-12-1652-35/+1005
|\
| * Update release notesErlang/OTP2015-12-1527-3/+973
| * Update version numbersErlang/OTP2015-12-1522-22/+22
| * Merge branch 'ia/libressl' into maintErlang/OTP2015-12-152-11/+12
| |\
| * \ Merge branch 'siri/appups-18.2' into maintErlang/OTP2015-12-153-10/+10
| |\ \
| | * | Update appups in kernel, stdlib and sasl for OTP-18.2Siri Hansen2015-12-113-10/+10
* | | | Merge branch 'ia/libressl' into maintIngela Anderton Andin2015-12-152-11/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | ssl: Print openssl version stringIngela Anderton Andin2015-12-141-0/+1
| * | | ssl: Do not use environment variables in openSSL config fileIngela Anderton Andin2015-12-141-11/+11
* | | | ssl: Convert all test to use "ssl_test_lib:portable_open_port"Ingela Anderton Andin2015-12-151-62/+61
| |/ / |/| |
* | | Merge branch 'ia/inets/dialyzer-custom' into maintIngela Anderton Andin2015-12-153-2/+4
|\ \ \
| * | | inets: Include behaviour modules in install targetIngela Anderton Andin2015-12-152-1/+2
| * | | inets: Fix dialyzer warningIngela Anderton Andin2015-12-151-1/+2
* | | | Merge branch 'zandra/fix-snmp-appup' into maintZandra2015-12-141-1/+2
|\ \ \ \
| * | | | correct the snmp app up fileZandra2015-12-111-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'dgud/wx/fix-observer-display' into maintDan Gudmundsson2015-12-141-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | wx: Revert part of 617387025b698cDan Gudmundsson2015-12-121-2/+2
* | | | Merge branch 'ia/pr/919/OTP-13189' into maintIngela Anderton Andin2015-12-142-1/+39
|\ \ \ \
| * | | | ssl: fix hibernate_after with instant or near instant timeoutsAndrey Mayorov2015-12-112-1/+39
| | |_|/ | |/| |
* | | | Merge branch 'siri/sasl/doc-editors/OTP-13000' into maintSiri Hansen2015-12-1115-1360/+1434
|\ \ \ \ | |/ / / |/| | |
| * | | sasl: Editorial changesxsipewe2015-12-1015-1360/+1434
* | | | ssl: Fix typosIngela Anderton Andin2015-12-111-2/+2
* | | | Merge branch 'ia/ssl/windows-tests' into maintIngela Anderton Andin2015-12-113-121/+125
|\ \ \ \
| * | | | ssl: Use test case time out insteadIngela Anderton Andin2015-12-091-3/+1
| * | | | ssl: Use spawn_executableIngela Anderton Andin2015-12-093-118/+124
* | | | | Merge branch 'ia/ssl/renegotiate-tests' into maintIngela Anderton Andin2015-12-111-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | ssl: Add renegotiation exceptionIngela Anderton Andin2015-12-091-1/+3
| |/ / /
* | | | [inets] Correct broken linksLars Thorsen2015-12-111-8/+6
* | | | [orber] Align documentation to DTDLars Thorsen2015-12-111-4/+2
* | | | [inets] Align documentation to DTDLars Thorsen2015-12-116-233/+136
* | | | [ssl] Moved description details to man(6) pageLars Thorsen2015-12-112-31/+33
* | | | [ssh] Align documentation to DTDLars Thorsen2015-12-115-58/+62
* | | | [ssl] Correct the documentation so it follows the DTDLars Thorsen2015-12-114-12/+15
* | | | [erl_docgen] Update element section in DTDLars Thorsen2015-12-111-1/+1
* | | | [erl_docgen] Update element d in DTDLars Thorsen2015-12-111-1/+1
* | | | [erl_docgen] Update item element in DTDLars Thorsen2015-12-111-1/+1
* | | | Merge branch 'peppe/common_test/priv_dir_mode_bug' into maintPeter Andersson2015-12-111-2/+2
|\ \ \ \
| * | | | Make sure priv_dir names don't cause name clashesPeter Andersson2015-11-061-2/+2
* | | | | Merge branch 'peppe/common_test/exit_status_when_missing_suites' into maintPeter Andersson2015-12-112-12/+24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Let missing suites affect ct:run_test/1 return and ct_run exit statusPeter Andersson2015-12-102-12/+22
| * | | | Make abort_if_missing_suites option work in all io modesPeter Andersson2015-11-231-2/+4
* | | | | Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson2015-12-091-2/+6
|\ \ \ \ \
| * | | | | ssh: more info from failed caseHans Nilsson2015-12-081-2/+6
* | | | | | Merge branch 'anders/diameter/18.2/OTP-13180' into maintAnders Svensson2015-12-092-3/+5
|\ \ \ \ \ \
| * | | | | | vsn -> 1.11.1Anders Svensson2015-12-081-1/+1
| * | | | | | Update appup for 18.2Anders Svensson2015-12-081-2/+4
* | | | | | | Merge branch 'anders/diameter/request_leak/OTP-13137' into maintAnders Svensson2015-12-091-39/+38
|\ \ \ \ \ \ \
| * | | | | | | Fix request table leak at retransmissionAnders Svensson2015-12-091-37/+28
| * | | | | | | Fix request table leak at exit signalAnders Svensson2015-12-091-12/+20
* | | | | | | | [observer] Correct documentationHans Bolinder2015-12-095-25/+16
View Lorry Controller Status