summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dtls: We do not need to wait for DTLS over UDP serveringela/master/dtls/test-cuddleIngela Anderton Andin2018-01-031-92/+3
* Merge branch 'maint'Ingela Anderton Andin2017-12-201-3/+15
|\
| * Merge branch 'ingela/ssl/dtls-progress' into maintIngela Anderton Andin2017-12-201-3/+15
| |\
| | * dtls: Add handling of lost key exchange in cipher stateIngela Anderton Andin2017-12-201-0/+6
| | * ssl: Correct DTLS client close handlingIngela Anderton Andin2017-12-201-3/+9
| |/
* | Merge branch 'maint'Ingela Anderton Andin2017-12-201-2/+5
|\ \ | |/
| * Merge branch 'ingela/dtls-cuddling' into maintIngela Anderton Andin2017-12-201-2/+5
| |\
| | * dtls: Correct UDP listener cleanupIngela Anderton Andin2017-12-151-1/+4
| | * dtls: Correct return value in UDP listener initializationIngela Anderton Andin2017-12-151-1/+1
* | | Merge branch 'maint'Ingela Anderton Andin2017-12-201-8/+10
|\ \ \ | |/ /
| * | Merge branch 'ingela/DTLS/retransmission-timers' into maintIngela Anderton Andin2017-12-201-8/+10
| |\ \
| | * | dtls: Use repeat_state to make sure retransmission timer is resetIngela Anderton Andin2017-12-181-8/+10
* | | | Merge branch 'maint'Ingela Anderton Andin2017-12-201-1/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'ingela/Jxck/PR-1656/OTP-14843' into maintIngela Anderton Andin2017-12-201-1/+0
| |\ \ \
| | * | | remove duplicate operation for decode certificateJxck2017-12-191-1/+0
* | | | | Merge pull request #1659 from bjorng/bjorn/compiler/avoid-stackframeBjörn Gustavsson2017-12-201-1/+36
|\ \ \ \ \
| * | | | | v3_codegen: Don't let exit BIFs force a stack frameBjörn Gustavsson2017-12-181-1/+36
* | | | | | Merge branch 'maint'Ingela Anderton Andin2017-12-201-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1660 from bitnitdit/ssl_doc_duplicate_wordIngela Andin2017-12-191-1/+1
| |\ \ \ \ \
| | * | | | | Remove one of the duplicate word "use"bitnitdit2017-12-191-1/+1
* | | | | | | Merge branch 'sverker/cleanup-some-ERTS_SMP'Sverker Eriksson2017-12-193-4/+1
|\ \ \ \ \ \ \
| * | | | | | | erts: Remove some straggling ERTS_SMPSverker Eriksson2017-12-123-4/+1
* | | | | | | | Merge branch 'dgud/kernel/refc_sched_wall_time/OTP-11694'Dan Gudmundsson2017-12-1916-71/+321
|\ \ \ \ \ \ \ \
| * | | | | | | | test: spawn scheduler_wall_time flag holderDan Gudmundsson2017-12-191-13/+25
| * | | | | | | | Turn on scheduler_wall_time in an alive processDan Gudmundsson2017-12-191-3/+3
| * | | | | | | | Redirect system_flag(scheduler_wall_time,_) to kernel_refcRickard Green2017-12-1910-53/+77
| * | | | | | | | kernel: add a resource reference counterDan Gudmundsson2017-12-015-4/+218
* | | | | | | | | Merge branch 'maint'Dan Gudmundsson2017-12-194-4/+31
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-20' into maintDan Gudmundsson2017-12-195-5/+32
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Updated OTP versionOTP-20.2.2Erlang/OTP2017-12-182-1/+2
| | * | | | | | | Prepare releaseErlang/OTP2017-12-182-2/+28
| | * | | | | | | Merge branch 'dgud/mnesia/checkpoint-crash/OTP-14841' into maint-20Erlang/OTP2017-12-181-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | mnesia: Fix checkpoint crashDan Gudmundsson2017-12-181-2/+2
| | * | | | | | | | Merge branch 'dgud/mnesia/slow-startup/OTP-14829' into maint-20Erlang/OTP2017-12-181-13/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2017-12-191-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ingela/inets/httpc-tests' into maintIngela Anderton Andin2017-12-191-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | inets: Add missing argument in httpc_SUITEIngela Anderton Andin2017-12-181-2/+2
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2017-12-191-0/+37
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ingela/ssl/engin-ug-doc' into maintIngela Anderton Andin2017-12-191-0/+37
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | ssl: Add engine use case to Users GuideIngela Anderton Andin2017-12-151-0/+37
| | |/ / / / / / /
* | | | | | | | | Merge branch 'raimo/stdlib/rand-uniformity'Raimo Niskanen2017-12-191-1/+207
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Tweak statistics limitsRaimo Niskanen2017-11-011-4/+4
| * | | | | | | | | Improve check on normal distribution tailRaimo Niskanen2017-10-311-48/+51
| * | | | | | | | | Test normal distributionRaimo Niskanen2017-10-271-1/+204
* | | | | | | | | | Merge branch 'maint'Dan Gudmundsson2017-12-182-13/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge branch 'maint-19' into maintDan Gudmundsson2017-12-182-13/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updated OTP versionOTP-19.3.6.5Erlang/OTP2017-12-152-1/+2
| | * | | | | | | | Prepare releaseErlang/OTP2017-12-156-4/+73
| | * | | | | | | | Merge branch 'rickard/node-mon-proc-exit-race/OTP-14781' into maint-19Erlang/OTP2017-12-151-16/+18
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'dgud/mnesia/slow-startup/OTP-14829' into maint-19Erlang/OTP2017-12-151-13/+3
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |