aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2017-03-08Merge branch 'maint'Anders Svensson
2017-03-08Merge branch 'anders/diameter/capx_strictness/OTP-14257' into maintAnders Svensson
2017-03-08Merge branch 'maint'Anders Svensson
2017-03-08Merge branch 'anders/diameter/19.3/OTP-14252' into maintAnders Svensson
2017-03-08Merge branch 'anders/diameter/19.2/failover/OTP-14206' into maintAnders Svensson
2017-03-08Merge branch 'maint'Ingela Anderton Andin
2017-03-08Merge branch 'ingela/ssl/next-maint-version' into maintIngela Anderton Andin
2017-03-08Merge branch 'ingela/ssl/dtls-cont' into maintIngela Anderton Andin
2017-03-08dtls: Only test this for TLS for nowIngela Anderton Andin
2017-03-08Add transport_opt() capx_strictnessAnders Svensson
2017-03-08Merge branch 'maint'Björn Gustavsson
2017-03-08Merge pull request #1366 from bjorng/bjorn/travis/print-progress-dotsBjörn Gustavsson
2017-03-07Avoid sending large terms between nodes unnecessarilyAnders Svensson
2017-03-07Don't use request table for answer routingAnders Svensson
2017-03-07erts: Fix xml lint warning for erl_nifSverker Eriksson
2017-03-07dtls: Avoid mixup of protocol to testIngela Anderton Andin
2017-03-07Merge branch 'maint'Lars Thorsen
2017-03-07Merge branch 'lars/xmerl/compiler_and_dialyzer_warnings/OTP-14212' into maintLars Thorsen
2017-03-07[xmerl] Fix compiler and dialyzer warningsLars Thorsen
2017-03-07dtls: 'dtlsv1.2' corresponds to 'tlsv1.2'Ingela Anderton Andin
2017-03-07Travis CI: Avoid that builds gets killed for inactivityBjörn Gustavsson
2017-03-06Merge branch 'maint'Sverker Eriksson
2017-03-06Merge branch 'sverker/zlib-option-8/ERL-362/OTP-14254' into maintSverker Eriksson
2017-03-06erts: Fix typo and clearify warning in zlib docsSverker Eriksson
2017-03-06dtls: Correct dialyzer spec and postpone inclusion of testIngela Anderton Andin
2017-03-06Merge branch 'maint'Hans Bolinder
2017-03-06Merge branch 'hasse/dialyzer/fix_warnings/OTP-14177' into maintHans Bolinder
2017-03-06Merge branch 'maint'Raimo Niskanen
2017-03-06Merge branch 'maint-r14' into maintRaimo Niskanen
2017-03-06Merge branch 'maint-r13' into maintRaimo Niskanen
2017-03-06Merge branch 'maint'Sverker Eriksson
2017-03-06Merge branch 'sverker/zlib-option-8/ERL-362/OTP-14254' into maintSverker Eriksson
2017-03-06Merge branch 'maint'Lukas Larsson
2017-03-06Merge branch 'lukas/erts/19.3-doc-fixes' into maintLukas Larsson
2017-03-06dtls: Erlang distribution over DTLS is not supportedIngela Anderton Andin
2017-03-06dtls: Enable some DTLS tests in ssl_to_openssl_SUITEIngela Anderton Andin
2017-03-06dtls: Enable DTLS test in ssl_certificate_verify_SUITEIngela Anderton Andin
2017-03-06dtls: Hibernation and retransmit timersIngela Anderton Andin
2017-03-06dtls: Make sure retransmission timers are runIngela Anderton Andin
2017-03-06dtls: DTLS specific handling of socket and ciphersIngela Anderton Andin
2017-03-06Merge branch 'maint'Peter Andersson
2017-03-06Merge pull request #1313 from expelledboy/maintBjörn Gustavsson
2017-03-06Merge branch 'peppe/common_test/multiply_timetraps/OTP-14210' into maintPeter Andersson
2017-03-06Merge branch 'maint'Siri Hansen
2017-03-06Merge branch 'siri/ct_hooks/callbacks-on-skip/OTP-10599' into maintSiri Hansen
2017-03-03vsn -> 1.12.2Anders Svensson
2017-03-03Update appup for 19.3Anders Svensson
2017-03-03Merge branch 'maint'Björn Gustavsson
2017-03-03Merge pull request #1361 from bjorng/bjorn/home-directory/ERL-161/OTP-14249Björn Gustavsson
2017-03-03Merge branch 'maint'Raimo Niskanen