summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'ia/ssl/ECC-tests' into maintIngela Anderton Andin2015-12-111-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge branch 'lars/correct-doc-bugs' into maintLars Thorsen2015-12-1116-345/+253
|\ \ \ \ \ \ \ \
| * | | | | | | | [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
|/ / / / / / / /
* | | | | | | | Merge branch 'lars/erl_docgen/fix-dtd-tags' into maintLars Thorsen2015-12-112-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | [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 'sverk/dist-ctrl-msg-overflow' into maintSverker Eriksson2015-12-095-41/+83
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | erts: Tweak hashmap heap size estimationSverker Eriksson2015-12-071-5/+8
| * | | | | | | | erts: Fix bug for remote control message containing fat mapsSverker Eriksson2015-12-073-10/+33
| * | | | | | | | erts: Add test for remote exit signal with fat mapSverker Eriksson2015-12-071-24/+37
| * | | | | | | | erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS modeSverker Eriksson2015-12-031-2/+5
* | | | | | | | | 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
* | | | | | | | | | | [common_test] Correct documentationHans Bolinder2015-12-096-44/+42
* | | | | | | | | | | Merge branch 'siri/ct_netconfc/slow-down/OTP-13007' into maintSiri Hansen2015-12-094-24/+75
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Extended table_trans timer in order to handle big data on slow machinesSiri Hansen2015-12-042-2/+2
| * | | | | | | | | | Don't log headings without contentSiri Hansen2015-09-282-9/+27
| * | | | | | | | | | Speed up receive of many small packagesSiri Hansen2015-09-283-14/+47
* | | | | | | | | | | Merge branch 'ia/ssl-prepare-release' into maintIngela Anderton Andin2015-12-094-15/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ssl: Correct specIngela Anderton Andin2015-12-081-1/+1
| * | | | | | | | | | | ssl: Prepare for releaseIngela Anderton Andin2015-12-083-14/+4
* | | | | | | | | | | | Merge branch 'hb/stdlib/type_printing/OTP-13084' into maintHans Bolinder2015-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | erts: Correct the types section in The Abstract Format documentHans Bolinder2015-12-091-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'hans/ssh/defensics_errors' into maintHans Nilsson2015-12-082-41/+64
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ssh: fix error for data fields errorsHans Nilsson2015-12-071-35/+45
| * | | | | | | | | | | ssh: fix error for bad packet lengths found by DefensicsHans Nilsson2015-12-072-6/+19