summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Raimo Niskanen2019-09-092-28/+53
|\
| * Merge branch 'raimo/doc-cleanup' into maintRaimo Niskanen2019-09-092-28/+53
| |\
| | * Mention action handling details in user's guideRaimo Niskanen2019-08-011-0/+12
| | * Clarify handling of ActionsRaimo Niskanen2019-07-311-28/+41
* | | Merge branch 'maint'Raimo Niskanen2019-09-091-24/+29
|\ \ \ | |/ /
| * | Merge branch 'raimo/test-cuddling' into maintRaimo Niskanen2019-09-091-24/+29
| |\ \
| | * | Make check of delay_send error more forgivingRaimo Niskanen2019-08-011-24/+29
| | |/
* | | Merge branch 'maint'Sverker Eriksson2019-09-091-1/+1
|\ \ \ | |/ /
| * | Merge pull request #2377 from MikeBenza/patch-1Sverker Eriksson2019-09-091-1/+1
| |\ \
| | * | Fix grammatical error in erl_nif documentationMike Benza2019-09-061-1/+1
* | | | Merge branch 'maint'Micael Karlberg2019-09-091-96/+247
|\ \ \ \ | |/ / /
| * | | Merge branch 'bmk/megaco/20190904/test_tweaking' into maintMicael Karlberg2019-09-091-96/+247
| |\ \ \
| | * | | [megaco|test] Message test case(s) race fixMicael Karlberg2019-09-041-90/+229
| | * | | [megaco|test] Message test case race fixMicael Karlberg2019-09-041-9/+21
* | | | | Merge branch 'maint'Micael Karlberg2019-09-094-28/+86
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'bmk/megaco/20190903/timer_testing' into maintMicael Karlberg2019-09-094-28/+86
| |\ \ \ \ | | |/ / /
| | * | | [megaco|test] Add some printouts to timer test caseMicael Karlberg2019-09-041-2/+9
| | * | | [megaco|test] Conditionally skip megaco testMicael Karlberg2019-09-032-22/+75
| | * | | [megaco] Timer cancellation improvementsMicael Karlberg2019-09-032-4/+2
* | | | | Merge branch 'maint'Micael Karlberg2019-09-095-1165/+304
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'bmk/snmp/manager/use_system_event_monitor_in_mgr_test' into maintMicael Karlberg2019-09-092-1032/+38
| |\ \ \ \
| | * | | | [snmp|manager|test] Removed test cases for deprecated stuffMicael Karlberg2019-09-061-1006/+1
| | * | | | [snmp|manager|test] Add handling of system eventsMicael Karlberg2019-09-062-26/+37
| * | | | | Merge branch 'bmk/snmp/20190905/return_value_confuses_suite' into maintMicael Karlberg2019-09-093-133/+266
| |\ \ \ \ \
| | * | | | | [snmp|agent] Fixed verbosity printout formatingMicael Karlberg2019-09-051-4/+4
| | * | | | | [snmp|agent|test] Add and improve printoutsMicael Karlberg2019-09-051-106/+214
| | * | | | | [snmp|agent|test] Test function confuses suiteMicael Karlberg2019-09-051-23/+48
* | | | | | | Merge branch 'maint'Ingela Anderton Andin2019-09-091-7/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ingela/inets/doc/enhancment/PR-2344/OTP-16036' into maintIngela Anderton Andin2019-09-091-7/+9
| |\ \ \ \ \ \
| | * | | | | | inets:httpc - Clarify documentationIngela Anderton Andin2019-09-021-7/+9
* | | | | | | | Merge branch 'maint'Dan Gudmundsson2019-09-096-23/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'dgud/test-fixups' into maintDan Gudmundsson2019-09-096-23/+19
| |\ \ \ \ \ \ \
| | * | | | | | | ct: Remove windows temp-dir workaroundsDan Gudmundsson2019-06-271-11/+2
| | * | | | | | | Fix debug printoutsDan Gudmundsson2019-06-173-3/+3
| | * | | | | | | Don't fail if crypto is not availableDan Gudmundsson2019-06-171-6/+11
| | * | | | | | | Avoid div zero in test_suiteDan Gudmundsson2019-06-171-3/+3
* | | | | | | | | Merge branch 'maint'Hans Nilsson2019-09-095-173/+348
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'hans/ssh/connection_info_update/OTP-16040' into maintHans Nilsson2019-09-095-173/+348
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | ssh: Extend ssh:daemon_infoHans Nilsson2019-09-063-22/+82
| | * | | | | | | ssh: Extend ssh:connection_infoHans Nilsson2019-09-063-22/+113
| | * | | | | | | ssh: Internal option definitions format changedHans Nilsson2019-09-051-129/+153
* | | | | | | | | Merge branch 'maint'Sverker Eriksson2019-09-061-1/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'sverker/proc-exit-dist-trap' into maintSverker Eriksson2019-09-061-1/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | erts: Fix bugs for exiting process and ERTS_DSIG_SEND_YIELDSverker Eriksson2019-09-041-1/+10
* | | | | | | | | | Merge branch 'maint'Sverker Eriksson2019-09-064-17/+42
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'sverker/ets-info-binary-bus-error' into maintSverker Eriksson2019-09-064-17/+42
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | erts: Fix ets compressed offheap inspectionsSverker Eriksson2019-09-054-17/+42
| | |/ / / / / / /
* | | | | | | | | Merge branch 'maint'Micael Karlberg2019-09-061-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'bmk/snmp/misc_dialyzer/OTP-10400' into maintMicael Karlberg2019-09-061-6/+6
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | [snmp|agent] Fix dets bchunk return handlingMicael Karlberg2019-09-031-6/+6
| | | |_|_|_|/ / | | |/| | | | |