summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Ingela Anderton Andin2018-11-081-2/+15
|\
| * Merge branch 'ingela/public-key/more-sha2' into maintIngela Anderton Andin2018-11-081-2/+15
| |\
| | * public_key: Add additional ASN-1 definitions for DSA SHA2 supportIngela Anderton Andin2018-11-061-2/+15
* | | Remerge branch 'sverker/erts/ordered_set-select-improvements/OTP-15325'Sverker Eriksson2018-11-071-10/+14
|\ \ \
| * | | erts: Fix bug for catree iterationSverker Eriksson2018-11-011-10/+14
* | | | Merge branch 'peterdmv/ssl/fix-logging/OTP-15372'Péter Dimitrov2018-11-072-12/+26
|\ \ \ \
| * | | | ssl: Fix logging in new sender processPéter Dimitrov2018-11-062-12/+26
* | | | | Merge branch 'maint'Björn Gustavsson2018-11-0610-17/+205
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'bjorn/erts/persistent_terms/OTP-14669' into maintBjörn Gustavsson2018-11-0610-17/+206
| |\ \ \ | | |_|/ | |/| |
| | * | Implement a tab for persistent terms in crashdump viewerBjörn Gustavsson2018-11-068-14/+148
| | * | Add tests of persistent terms for crashdump_viewerBjörn Gustavsson2018-11-062-2/+57
| | * | Add a persistent term storageBjörn Gustavsson2018-11-061-1/+1
* | | | Merge branch 'maint'Ingela Anderton Andin2018-11-063-2/+52
|\ \ \ \ | |/ / /
| * | | ssl: controlling_process should be allowed on transpor_accept sockets alongIngela Anderton Andin2018-11-053-2/+52
* | | | Merge branch 'maint'Ingela Anderton Andin2018-11-053-14/+43
|\ \ \ \ | |/ / /
| * | | ssl: Correct filter functionIngela Anderton Andin2018-11-023-14/+43
* | | | Merge branch 'maint'Ingela Anderton Andin2018-11-021-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'ingela/ssl/deliver-all-data-at-close/ERL-731/OTP-15412' into maintIngela Anderton Andin2018-11-021-1/+2
| |\ \ \
| | * | | ssl: Extend check for undelivered data at closingIngela Anderton Andin2018-11-021-1/+2
* | | | | Merge branch 'maint'Ingela Anderton Andin2018-11-021-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ingela/ssl/bench_SUITE-clean-start' into maintIngela Anderton Andin2018-11-021-0/+1
| |\ \ \ \
| | * | | | ssl: Make sure benchmark SUITE has a clean startIngela Anderton Andin2018-11-021-0/+1
* | | | | | Merge branch 'maint'Björn Gustavsson2018-11-022-7/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'bjorn/compiler/fix-beam_jump/ERL-759/OTP-15400' into maintBjörn Gustavsson2018-11-022-7/+27
| |\ \ \ \ \
| | * | | | | Fix bug when beam_jump removes put_tuple instructionsBjörn Gustavsson2018-10-312-7/+27
* | | | | | | Merge pull request #2003 from peterdmv/ssl/tls1.3-statem-skeleton/OTP-15310Péter Dimitrov2018-11-0214-278/+1425
|\ \ \ \ \ \ \
| * | | | | | | ssl: Fix failing property testsPéter Dimitrov2018-11-014-176/+386
| * | | | | | | ssl: Implement decode of "supported_groups"Péter Dimitrov2018-10-244-65/+93
| * | | | | | | ssl: Implement TLS 1.3 state machine skeletonPéter Dimitrov2018-10-2411-56/+521
| * | | | | | | ssl: Add module for Finite Field DH groupsPéter Dimitrov2018-10-244-4/+448
* | | | | | | | Merge pull request #2011 from bjorng/bjorn/compiler/beam_exceptBjörn Gustavsson2018-11-022-33/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | beam_except: Generalize translation to func_info instructionsBjörn Gustavsson2018-10-302-33/+71
* | | | | | | | | Merge branch 'maint'John Högberg2018-11-022-8/+42
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'john/erts/minusminus_trapping/OTP-15371' into maintJohn Högberg2018-11-022-8/+42
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Optimize operator '--' and yield on large inputsJohn Högberg2018-10-292-8/+42
* | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2018-11-023-3/+50
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | ssl: Return error to user that tries to use a "transport accepted" socket forIngela Anderton Andin2018-11-013-3/+50
* | | | | | | | | Merge branch 'bmk/20180927/remove_otp_mibs2/OTP-14984'Micael Karlberg2018-11-0155-4041/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [snmp] Update version (-> 5.3)Micael Karlberg2018-09-271-1/+1
| * | | | | | | | | [snmp] Make sure it supports parallel makeMicael Karlberg2018-09-271-0/+3
| * | | | | | | | | [otp_mibs] Removed the app otp_mibsMicael Karlberg2018-09-2732-2522/+0
| * | | | | | | | | [snmp+otp_mibs] Moved mib and update system docMicael Karlberg2018-09-272-0/+1
| * | | | | | | | | [otp_mibs] Prep removing otp_mibsMicael Karlberg2018-09-271-1/+1
| * | | | | | | | | [snmp] Cleanup before removing the otp_mibs appMicael Karlberg2018-09-273-30/+8
| * | | | | | | | | os_mon: Remove the os_mon MIBS supportLukas Larsson2018-09-2717-1487/+6
* | | | | | | | | | Merge branch 'bjorn/compiler/diffable'Björn Gustavsson2018-11-013-1/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a diffable option for the compilerBjörn Gustavsson2018-10-233-1/+37
* | | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2018-11-011-16/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1990 from max-au/ssl_pem_cache_timezone_fixIngela Andin2018-11-011-16/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ssl: fix timezone-related bug in ssl_pem_cacheMaxim Fedorov2018-10-261-16/+7