aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-03-07Merge branch 'maint'Péter Dimitrov
2018-03-07Merge pull request #1724 from lucafavatella/http_uri-typesPéter Dimitrov
2018-03-07Merge branch 'rickard/psflgs/OTP-14948'Rickard Green
2018-03-06Merge branch 'raimo/stop-encouraging-v4-mapped/ERL-503/OTP-13716'Raimo Niskanen
2018-03-06Merge branch 'maint'Ingela Anderton Andin
2018-03-06Merge branch 'ingela/maint/voltone/ssl_anonymous_with_openssl/PR-1729/OTP-149...Ingela Anderton Andin
2018-03-06Merge branch 'maint'Hans Nilsson
2018-03-06Merge branch 'hans/ssh/cuddle_README' into maintHans Nilsson
2018-03-06ssl: Fix anonymous suites regression and protocol errorBram Verburg
2018-03-06Merge branch 'maint'Péter Dimitrov
2018-03-06Merge branch 'peterdmv/inets/unix_domain_socket/OTP-14854' into maintPéter Dimitrov
2018-03-06inets: work around http_uri:parse Dialyzer warning in uri_SUITE.erl:274Luca Favatella
2018-03-06inets: Prepare for releasePéter Dimitrov
2018-03-06Merge remote-tracking branch 'origin/hasse/kernel/rpc_doc_fix/OTP-10551'Hans Bolinder
2018-03-06Merge branch 'maint'Anders Svensson
2018-03-06Merge branch 'anders/diameter/20.3/OTP-14946' into maintAnders Svensson
2018-03-05Merge pull request #1560 from tsloughter/no_warn_sysconfigSiri Hansen
2018-03-05ssh: README updated with missing 4-number's versionsHans Nilsson
2018-03-05Merge branch 'maint' of github.com:erlang/otp into maintLars Thorsen
2018-03-05Merge branch 'lars/ssl/test-config-changes/OTP-14949' into maintLars Thorsen
2018-03-05[ssl] Fix hanging test case on outdated lab machineLars Thorsen
2018-03-05Merge branch 'lars/crypto/test-config-changes/OTP-14949' into maintLars Thorsen
2018-03-05inets: refine types and doc of http_uri:parse optionsLuca Favatella
2018-03-05[crypto] Fix hanging test case on outdated lab machineLars Thorsen
2018-03-05Merge branch 'maint'Hans Nilsson
2018-03-05Merge branch 'maint-18' into maintHans Nilsson
2018-03-05inets: export types documented for http_uri moduleLuca Favatella
2018-03-05Replace usage of ERTS_PSFLG_BOUNDRickard Green
2018-03-05Remove ERTS_PSFLG_ON_HEAP_MSGQRickard Green
2018-03-05Update primary bootstrapRickard Green
2018-03-05Merge branch 'maint'Hans Nilsson
2018-03-05Merge branch 'hans/ssh/closed_chan_block/OTP-14939' into maintHans Nilsson
2018-03-05Merge branch 'maint'Anders Svensson
2018-03-05Merge branch 'anders/diameter/terminate/ERIERL-124' into maintAnders Svensson
2018-03-05Merge branch 'anders/diameter/reg/OTP-14839' into maintAnders Svensson
2018-03-05vsn -> 2.1.4Anders Svensson
2018-03-05Update appup for 20.3Anders Svensson
2018-03-05Update service_info examples in docAnders Svensson
2018-03-05Fix inaccurate commentAnders Svensson
2018-03-05Merge branch 'john/erts/efile_SUITE-iter-max-files-stability'John Högberg
2018-03-05Merge branch 'maint'Raimo Niskanen
2018-03-05Merge branch 'raimo/asn1/dialyzer-dead-code/ERIERL-144/OTP-13882' into maintRaimo Niskanen
2018-03-05inets: Skip http_unix_socket test group on WindowsPéter Dimitrov
2018-03-05Merge branch 'maint'Ingela Anderton Andin
2018-03-05Merge branch 'ingela/ssl/AEAD-handling/ERL-568' into maintIngela Anderton Andin
2018-03-05ssl: Correct AEAD handlingIngela Anderton Andin
2018-03-02Merge branch 'lukas/erts/ecio_arg_fix'Lukas Larsson
2018-03-02erts: Correctly ignore +secio trueLukas Larsson
2018-03-02Merge pull request #1734 from wojtekmach/wm-erl-tar-docs-typoLukas Larsson
2018-03-02Merge branch 'maint'Dan Gudmundsson