summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | [snmp|manager|doc] Document the new (restart) functionMicael Karlberg2020-02-041-1/+16
| * | | | | | | | | [snmp|manager] Make it possible to restart the net-ifMicael Karlberg2020-02-042-14/+37
* | | | | | | | | | Merge branch 'raimo/stdlib/gen_statem-change_cb' into maintRaimo Niskanen2020-03-065-121/+281
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve function nameRaimo Niskanen2020-02-211-82/+83
| * | | | | | | | | Document change|push|pop _callback_moduleRaimo Niskanen2020-02-212-13/+113
| * | | | | | | | | Implement push and pop of callback moduleRaimo Niskanen2020-02-213-26/+85
* | | | | | | | | | Merge branch 'peterdmv/ssl/session-invalidation-at-abrupt-close/OTP-16479' in...Péter Dimitrov2020-03-063-20/+228
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | ssl: Invalidate session on abrupt close during initial handshakeIngela Anderton Andin2020-02-243-20/+228
* | | | | | | | | | Merge branch 'maint-21' into maintJohn Högberg2020-03-053-3/+40
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Updated OTP versionOTP-21.3.8.14Erlang/OTP2020-03-042-1/+2
| * | | | | | | | | Prepare releaseErlang/OTP2020-03-043-4/+43
| * | | | | | | | | Merge branch 'sverker/ets-update-counter-fix/ERL-1127/OTP-16404' into maint-21Erlang/OTP2020-03-043-6/+32
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rickard/dirty-low-prio-bug/ERL-1157/OTP-16446' into maint-21Erlang/OTP2020-03-042-2/+94
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/+SDio-range/OTP-16481' into maint-21Erlang/OTP2020-03-042-4/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/kill2killed-test' into maint-21Erlang/OTP2020-03-041-2/+66
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/public_key/edwardcurves-TLS-1.2/OTP-16528' into maintIngela Anderton Andin2020-03-058-7/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ssl: Add TLS-1.3 group to ssl_cipher_suite_SUITEIngela Anderton Andin2020-03-042-3/+96
| * | | | | | | | | | | | | | ssl: Add support for key exchange with Edwards curves and RSASSA-PSS in TLS-1.2Ingela Anderton Andin2020-03-043-2/+26
| * | | | | | | | | | | | | | public_key: Add support for key exchange with Edward curvesIngela Anderton Andin2020-03-033-2/+18
* | | | | | | | | | | | | | | Merge branch 'hasse/doc/fix_link' into maintHans Bolinder2020-03-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | doc: Fix a linkHans Bolinder2020-03-051-2/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'bmk/snmp/20200219/test_tweaking' into maintMicael Karlberg2020-03-0419-2435/+2868
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [snmp|manager|test] Tweaked the manager config suiteMicael Karlberg2020-02-261-7/+36
| * | | | | | | | | | | | | | | [snmp|manager|test] Tweaked the info test caseMicael Karlberg2020-02-261-25/+37
| * | | | | | | | | | | | | | | [snmnp|test] Add analyze function for windowsMicael Karlberg2020-02-261-11/+159
| * | | | | | | | | | | | | | | [snmp|test] Add common 'ensure not running' functionMicael Karlberg2020-02-253-140/+175
| * | | | | | | | | | | | | | | [snmp|test] Manager config suite print cleanupMicael Karlberg2020-02-241-420/+441
| * | | | | | | | | | | | | | | [snmp|test] Manager user suite print cleanupMicael Karlberg2020-02-241-144/+146
| * | | | | | | | | | | | | | | [snmp|test] Manager suite print cleanupMicael Karlberg2020-02-241-567/+660
| * | | | | | | | | | | | | | | [snmp|test] SnmpNet suite print cleanupMicael Karlberg2020-02-241-7/+34
| * | | | | | | | | | | | | | | [snmp|test] PDUs (codec) suite print cleanupMicael Karlberg2020-02-241-64/+102
| * | | | | | | | | | | | | | | [snmp|test] Note store suite print cleanupMicael Karlberg2020-02-241-53/+132
| * | | | | | | | | | | | | | | [snmp|test] Log suite print cleanupMicael Karlberg2020-02-241-83/+44
| * | | | | | | | | | | | | | | [snmp|test] Config suite print cleanupMicael Karlberg2020-02-241-11/+29
| * | | | | | | | | | | | | | | [snmp|test] MIB Compiler suite print cleanupMicael Karlberg2020-02-241-81/+106
| * | | | | | | | | | | | | | | [snmp|test] Agent mib server suite print cleanupMicael Karlberg2020-02-241-25/+25
| * | | | | | | | | | | | | | | [snmp|test] Agent conf suite print cleanupMicael Karlberg2020-02-241-2/+2
| * | | | | | | | | | | | | | | [snmp|test] Agent suite print cleanupMicael Karlberg2020-02-244-743/+687
| * | | | | | | | | | | | | | | [snmp|test] Print and misc cleanupMicael Karlberg2020-02-244-70/+71
* | | | | | | | | | | | | | | | Merge pull request #2365 from JeromeDeBretagne/jdb/rename-service-discovery-i...Björn Gustavsson2020-03-044-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Rename Service Discovery into Node Discovery in documentationJérôme de Bretagne2019-08-304-13/+13
* | | | | | | | | | | | | | | | | Merge branch 'bmk/erts/esock/20200228/compiler_warning_cleanup' into maintMicael Karlberg2020-03-031-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | [esock] Used wrong debug macroMicael Karlberg2020-02-281-3/+3
* | | | | | | | | | | | | | | | | | Merge branch 'bmk/erts/esock/20200225/test_tweaking' into maintMicael Karlberg2020-03-031-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | [esock|test] Conditionally skip some test groupsMicael Karlberg2020-02-251-0/+19
* | | | | | | | | | | | | | | | | | Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson2020-03-021-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ssh: Remove ssh:set_sock_opt not setable on WindowsHans Nilsson2020-03-021-6/+5
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'john/compiler/combine-empty-segments/OTP-16515' into maintJohn Högberg2020-03-022-7/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | beam_ssa_bsm: Fix invalid match combinationsJohn Högberg2020-02-282-7/+28
* | | | | | | | | | | | | | | | | | Merge branch 'maint-22' into maintAnders Svensson2020-02-285-2/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |