summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update so that doxygen 1.8.11 can generate codeDan Gudmundsson2017-08-166-23/+23
* Merge pull request #1484 from Gsantomaggio/otp_observer_add_infoDan Gudmundsson2017-08-163-11/+62
|\
| * Add System statistics / limit panelGabriele Santomaggio2017-08-113-11/+62
* | Merge pull request #1532 from angelhof/public_key/generate_key-rsa-inconsiste...Ingela Andin2017-08-152-8/+8
|\ \
| * | Change version of hardcoded RSA test recordsKonstantinos Kallas2017-07-281-6/+6
| * | RSAPrivateKey version is set to 'two-prime', as stated in documentation, and ...Konstantinos Kallas2017-07-251-2/+2
* | | Merge branch 'ingela/ssl/timeout-cuddle' into maintIngela Anderton Andin2017-08-142-1/+6
|\ \ \
| * | | ssl: Longer timeouts for test cases that do many handshakesIngela Anderton Andin2017-08-102-1/+6
* | | | Merge pull request #1527 from fenollp/gen_fsm-depre-20Ingela Andin2017-08-141-6/+6
|\ \ \ \
| * | | | gen_fsm-depre-20: fix some more redirections to unexisting functionsPierre Fenoll2017-08-081-2/+2
| * | | | gen_fsm-depre-20: fix gen_fsm deprecation recommendations after 20.0Pierre Fenoll2017-08-081-4/+4
* | | | | Merge pull request #1509 from vances/issue-erl-398Ingela Andin2017-08-112-9/+147
|\ \ \ \ \
| * | | | | Test case group for loggingVance Shipley2017-07-101-0/+129
| * | | | | Don't truncate existing disk_logs.Vance Shipley2017-07-101-9/+18
* | | | | | Merge branch 'ingela/ssl/cert-handling' into maintIngela Anderton Andin2017-08-117-762/+221
|\ \ \ \ \ \
| * | | | | | ssl: Correct cipher suite handlingIngela Anderton Andin2017-08-103-87/+69
| * | | | | | ssl: Modernize DSA cert chain generationIngela Anderton Andin2017-08-094-528/+52
| * | | | | | ssl: CleanIngela Anderton Andin2017-08-082-48/+0
| * | | | | | ssl: Remove test of OpenSSLIngela Anderton Andin2017-08-081-9/+1
| * | | | | | ssl: Use new cert generationIngela Anderton Andin2017-08-083-94/+103
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1526 from bjorng/bjorn/compiler/non-variable-applyBjörn Gustavsson2017-08-103-6/+88
|\ \ \ \ \ \
| * | | | | | sys_core_fold: Fix unsafe optimization of non-variable applyBjörn Gustavsson2017-08-073-6/+88
| |/ / / / /
* | | | | | Merge pull request #1507 from vances/issue-erl-442Ingela Andin2017-08-102-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Correct type specification in ssl:prf/5Vance Shipley2017-07-102-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'ingela/dtls/cuddle' into maintIngela Anderton Andin2017-08-101-15/+18
|\ \ \ \ \
| * | | | | ssl: Handle OpenSSL output correctlyIngela Anderton Andin2017-08-081-15/+18
* | | | | | Merge branch 'anders/diameter/message_cb/OTP-14486' into maintAnders Svensson2017-08-092-8/+41
|\ \ \ \ \ \
| * | | | | | Add simple message_cb to example serverAnders Svensson2017-08-031-1/+28
| * | | | | | Fix inappropriate message callbacksAnders Svensson2017-06-251-7/+13
* | | | | | | Merge branch 'anders/diameter/20.0/shared_transport/OTP-14011' into maintAnders Svensson2017-08-091-2/+23
|\ \ \ \ \ \ \
| * | | | | | | Don't assume nodes are eternally connected when sharing transportAnders Svensson2017-06-211-2/+23
| |/ / / / / /
* | | | | | | Merge branch 'anders/diameter/transport/ERL-332' into maintAnders Svensson2017-08-092-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove irrelevant commentAnders Svensson2017-06-281-1/+1
| * | | | | | Add missing setopts after deferred diameter_{tcp,sctp} actionsAnders Svensson2017-06-212-2/+2
* | | | | | | Merge branch 'maint-19' into maintJohn Högberg2017-07-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Updated OTP versionOTP-19.3.6.2Erlang/OTP2017-07-252-1/+2
| * | | | | | | Update release notesErlang/OTP2017-07-251-0/+36
| * | | | | | | Update version numbersErlang/OTP2017-07-251-1/+1
| * | | | | | | Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maint-19Erlang/OTP2017-07-253-3/+96
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'john/erts/fix-tcp-send-timeout/OTP-14509/ERL-448' into maint-19Erlang/OTP2017-07-251-16/+29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-19Erlang/OTP2017-07-251-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #1520 from NOMORECOFFEE/fix_array_spec_typoRaimo Niskanen2017-07-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix array spec typoВеселов Андрей2017-07-241-1/+1
* | | | | | | | | | | | Merge branch 'maint-20' into maintJohn Högberg2017-07-2714-25/+122
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated OTP versionOTP-20.0.2Erlang/OTP2017-07-262-1/+2
| * | | | | | | | | | | | Update release notesErlang/OTP2017-07-263-0/+66
| * | | | | | | | | | | | Update version numbersErlang/OTP2017-07-263-3/+3
| * | | | | | | | | | | | Merge branch 'sverker/asn1/missing-quotes/OTP-14519' into maint-20Erlang/OTP2017-07-263-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | asn1: Fix missing quotes of external encoding callSverker Eriksson2017-07-203-2/+8
| * | | | | | | | | | | | | Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maint-20Erlang/OTP2017-07-263-3/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |