summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-20.3.2Erlang/OTP2018-03-212-1/+2
* Update release notesErlang/OTP2018-03-212-0/+34
* Update version numbersErlang/OTP2018-03-212-2/+2
* Merge branch 'hans/ssh/spec_double_algs/OTP-14990' into maint-20Erlang/OTP2018-03-211-1/+1
|\
| * ssh: Fix bad spec for double_algs() in ssh.hrlHans Nilsson2018-03-201-1/+1
* | Merge branch 'raimo/stdlib/fix-gen_statem-init-actions-check/OTP-13995' into ...Erlang/OTP2018-03-212-8/+13
|\ \ | |/ |/|
| * Test event insert from initRaimo Niskanen2018-03-171-4/+9
| * Fix init to allow all actionsRaimo Niskanen2018-03-151-4/+4
* | Updated OTP versionOTP-20.3.1Erlang/OTP2018-03-152-1/+2
* | Update release notesErlang/OTP2018-03-151-0/+16
* | Merge branch 'ingela/ssl/filter-bug/OTP-14981' into maint-20Erlang/OTP2018-03-154-8/+5
|\ \ | |/ |/|
| * ssl: Prepare for releaseIngela Anderton Andin2018-03-152-1/+3
| * ssl: Remove duplicate release noteIngela Anderton Andin2018-03-151-7/+0
| * ssl: Fix filter function to not discard AEAD cipher suitesIngela Anderton Andin2018-03-151-0/+2
|/
* Updated OTP versionOTP-20.3Erlang/OTP2018-03-092-1/+2
* Update release notesErlang/OTP2018-03-0917-2/+649
* Update version numbersErlang/OTP2018-03-0915-15/+15
* Update preloaded modulesHenrik2018-03-0914-0/+0
* Update primary bootstrapHenrik2018-03-094-0/+0
* Merge pull request #1724 from lucafavatella/http_uri-typesPéter Dimitrov2018-03-072-21/+57
|\
| * inets: work around http_uri:parse Dialyzer warning in uri_SUITE.erl:274Luca Favatella2018-03-061-1/+1
| * inets: refine types and doc of http_uri:parse optionsLuca Favatella2018-03-052-5/+17
| * inets: export types documented for http_uri moduleLuca Favatella2018-03-052-17/+41
* | Merge branch 'ingela/maint/voltone/ssl_anonymous_with_openssl/PR-1729/OTP-149...Ingela Anderton Andin2018-03-062-5/+126
|\ \
| * | ssl: Fix anonymous suites regression and protocol errorBram Verburg2018-03-062-5/+126
* | | Merge branch 'hans/ssh/cuddle_README' into maintHans Nilsson2018-03-061-0/+90
|\ \ \ | |/ / |/| |
| * | ssh: README updated with missing 4-number's versionsHans Nilsson2018-03-051-0/+90
* | | Merge branch 'peterdmv/inets/unix_domain_socket/OTP-14854' into maintPéter Dimitrov2018-03-0610-32/+200
|\ \ \
| * | | inets: Prepare for releasePéter Dimitrov2018-03-062-5/+1
| * | | inets: Skip http_unix_socket test group on WindowsPéter Dimitrov2018-03-051-3/+15
| * | | inets: Add unix domain socket support to httpcPéter Dimitrov2018-02-268-26/+186
* | | | Merge branch 'anders/diameter/20.3/OTP-14946' into maintAnders Svensson2018-03-064-17/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | vsn -> 2.1.4Anders Svensson2018-03-051-2/+2
| * | | Update appup for 20.3Anders Svensson2018-03-051-7/+8
| * | | Update service_info examples in docAnders Svensson2018-03-051-7/+7
| * | | Fix inaccurate commentAnders Svensson2018-03-051-1/+1
* | | | Merge branch 'maint' of github.com:erlang/otp into maintLars Thorsen2018-03-054-6/+16
|\ \ \ \
| * \ \ \ Merge branch 'maint-18' into maintHans Nilsson2018-03-054-6/+16
| |\ \ \ \
| | * | | | Updated OTP versionOTP-18.3.4.8Erlang/OTP2018-03-022-2/+2
| | * | | | Update release notesErlang/OTP2018-03-021-0/+16
| | * | | | Update version numbersErlang/OTP2018-03-021-1/+1
| | * | | | Merge branch 'hans/ssh/execfix18/OTP-14881' into maint-18Erlang/OTP2018-03-024-5/+99
| | |\ \ \ \
| | | * | | | ssh: Fix cliHans Nilsson2018-01-193-5/+24
| | | * | | | ssh: Test for disabled shellHans Nilsson2018-01-191-0/+75
| | |/ / / /
* | | | | | Merge branch 'lars/ssl/test-config-changes/OTP-14949' into maintLars Thorsen2018-03-051-17/+22
|\ \ \ \ \ \
| * | | | | | [ssl] Fix hanging test case on outdated lab machineLars Thorsen2018-03-051-17/+22
|/ / / / / /
* | | | | | Merge branch 'lars/crypto/test-config-changes/OTP-14949' into maintLars Thorsen2018-03-051-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [crypto] Fix hanging test case on outdated lab machineLars Thorsen2018-03-051-1/+6
|/ / / / /
* | | | | Merge branch 'hans/ssh/closed_chan_block/OTP-14939' into maintHans Nilsson2018-03-052-17/+46
|\ \ \ \ \
| * | | | | ssh: Fix the bugHans Nilsson2018-03-021-14/+32