summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-r16b02' into maint-r16maint-r16Raimo Niskanen2017-02-094-4/+70
|\
| * Merge branch 'bmk/snmp/compiler/allow_refinement_of_opaque/OTP-12066' into ma...maint-r16b02Micael Karlberg2014-07-234-4/+78
| |\
| | * [snmp/compiler] Assign "proper" (= carbonara) versionMicael Karlberg2014-07-212-3/+3
| | * [snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg2014-07-214-4/+78
* | | Prepare releaseerl_1271Erlang/OTP2016-02-262-1/+20
* | | Merge branch 'sverk/r16/crypto-EVP-aes_cbc/OTP-13384' into maint-r16Erlang/OTP2016-02-261-15/+39
|\ \ \
| * | | crypto: Fix undefined symbol EVP_CIPHER_CTX_newSverker Eriksson2016-02-261-8/+7
| * | | crypto: use EVP for AES-CBCAlex Wilson2016-02-261-15/+40
* | | | Update release notesErlang/OTP2015-12-091-0/+30
* | | | Merge branch 'anders/diameter/patch/OTP-13183' into maint-r16Erlang/OTP2015-12-092-3/+12
|\ \ \ \
| * | | | vsn -> 1.5.1Anders Svensson2015-12-091-1/+1
| * | | | Update appup for diameter 1.5.1Anders Svensson2015-12-091-2/+11
| |/ / /
* | | | Merge branch 'anders/diameter/logging/OTP-13182' into maint-r16Erlang/OTP2015-12-091-2/+1
|\ \ \ \
| * | | | Remove logging of faulty answer messagesAnders Svensson2015-12-091-2/+1
| |/ / /
* | | | Merge branch 'anders/diameter/pick_peer/OTP-11789' into maint-r16Erlang/OTP2015-12-091-1/+3
|\ \ \ \
| * | | | Fix pick_peer case clause failureAnders Svensson2014-03-201-1/+3
| |/ / /
* | | | Prepare releaseErlang/OTP2015-01-262-1/+20
* | | | Merge branch 'sverk/port_get_data-race-r16b03/OTP-12208' into maint-r16Erlang/OTP2015-01-263-7/+74
|\ \ \ \
| * | | | erts: Fix port data memory allocation bugSverker Eriksson2015-01-212-11/+17
| * | | | erts: Mend port_set_data with non-immed data for halfword VMSverker Eriksson2015-01-211-1/+2
| * | | | erts: Add test case for port_set_data and port_get_dataSverker Eriksson2015-01-211-0/+51
| * | | | erts: Fix race between port_set_data, port_get_data and port terminationSverker Eriksson2015-01-211-3/+11
| * | | | erts: Fix erlang:port_set_data/2 for non immediate dataSverker Eriksson2015-01-211-0/+1
* | | | | Merge branch 'marcus/16/fix-rebuild' into maint-r16Erlang/OTP2015-01-261-1/+1
|\ \ \ \ \
| * | | | | Sort keys before generatingLukas Larsson2014-11-281-1/+1
|/ / / / /
* | | | | Prepare releaseErlang/OTP2014-10-212-1/+29
* | | | | Merge branch 'rickard/eager-check-io/OTP-12117' into maint-r16Erlang/OTP2014-10-2124-178/+850
|\ \ \ \ \
| * | | | | Introduce support for eager check I/O schedulingRickard Green2014-09-2524-178/+850
|/ / / / /
* | | | | Update release notesErlang/OTP2014-07-222-0/+42
* | | | | Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16Erlang/OTP2014-07-2211-23/+179
|\ \ \ \ \
| * | | | | Fix default behaviour for legacy fdopenHenrik Nord2014-07-222-4/+5
| * | | | | erts: Fix inet close on prebound fdsBjörn-Egil Dahlberg2014-07-221-1/+1
| * | | | | kernel: When doing an fdopen we now also bind the fd to the specified addr/portLukas Larsson2014-07-2210-20/+175
|/ / / / /
* | | | | Merge branch 'hans/ssh/maint-r16/patch_1261' into maint-r16Hans Nilsson2014-02-243-30/+43
|\ \ \ \ \
| * | | | | fix calculation of variableHenrik Nord2014-02-141-1/+1
| * | | | | ssh: The server ssh_cli does not delay tty_geometry requests in case no tty i...Hans Nilsson2014-02-141-3/+12
| * | | | | ssh: fix 'known_hosts' bug in ssh_fileHans Nilsson2014-02-141-13/+13
| * | | | | ssh: Changed order of decode clauses to temp fix decode errorHans Nilsson2014-02-141-9/+12
| * | | | | ssh: Fixes memory crashHans Nilsson2014-02-141-2/+3
| * | | | | Fix that result on stderr sent back to ssh:exec had length info presentHans Nilsson2014-02-141-2/+2
|/ / / / /
* | | | | Merge branch 'maint-r16' into maintIngela Anderton Andin2014-02-100-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'maint-r15' into maint-r16Ingela Anderton Andin2014-02-100-0/+0
| |\ \ \ \ |/ / / / /
| * | | | Prepare releaseErlang/OTP2014-02-052-2/+18
| * | | | Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15Erlang/OTP2014-02-05222-11236/+13739
| |\ \ \ \
| | * | | | Changed to correct errorcode in testcaseFredrik Gustafsson2014-02-051-1/+1
| | * | | | inets: Prepare for releaseIngela Anderton Andin2014-02-051-2/+2
| | * | | | inets: Make test suites independent of each otherIngela Anderton Andin2014-02-051-2/+3
| | * | | | inets: Rewrite of test case to avoid timing issues in test codeIngela Anderton Andin2014-02-051-73/+75
| | * | | | Add missing brackets to report formatting on ftp_progress process exitArtur Wilniewczyc2014-02-051-1/+1
| | * | | | inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin2014-02-051-4/+1