summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | erts: Fix finite warning for clangLukas Larsson2014-12-021-1/+1
* | | | | | | | Merge branch 'lukas/erts/bif_info_rebuild/OTP-12344' into maintLukas Larsson2014-12-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Sort keys before generatingLukas Larsson2014-11-261-1/+1
* | | | | | | | | Merge branch 'tuncer/doc-fixes' into maintMarcus Arendt2014-12-023-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dict(3): fix typo reported by Rabbe FogelholmTuncer Ayaz2014-11-301-1/+1
| * | | | | | | | | Fix minor eprof and fprof doc issuesTuncer Ayaz2014-11-292-2/+2
* | | | | | | | | | Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin2014-12-022-36/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | inets: Prepare for releaseIngela Anderton Andin2014-12-012-36/+1
* | | | | | | | | | | Merge branch 'ia/ssl/dialyzer/OTP-12341' into maintIngela Anderton Andin2014-12-025-51/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ssl: Prepare for releaseIngela Anderton Andin2014-12-012-13/+1
| * | | | | | | | | | | ssl: Change code to reflect that state data may be secretIngela Anderton Andin2014-12-013-38/+41
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' in...Raimo Niskanen2014-12-024-1/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg2014-12-014-1/+71
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'hans/ssh/appup' into maintHans Nilsson2014-12-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | ssh: prepares appup file for releaseHans Nilsson2014-12-011-0/+10
* | | | | | | | | | Merge branch 'anders/diameter/filters/OTP-12308' into maintAnders Svensson2014-12-012-29/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Order peers in pick_peer callbacksAnders Svensson2014-11-272-29/+48
* | | | | | | | | | | Merge branch 'anders/diameter/connect_timer/OTP-12281' into maintAnders Svensson2014-12-016-36/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tweak reason in closed eventAnders Svensson2014-11-031-7/+4
| * | | | | | | | | | | Fix ignored connect timerAnders Svensson2014-11-031-19/+17
| * | | | | | | | | | | Check {connect,watchdog}_timer distinction in event testcasesAnders Svensson2014-11-031-5/+21
| * | | | | | | | | | | Rename reconnect_timer to connect_timer in examples and suitesAnders Svensson2014-11-034-6/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'anders/diameter/3xxx/OTP-12233' into maintAnders Svensson2014-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix handling of 3xxx Result-Code without E-bitAnders Svensson2014-10-101-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'anders/diameter/request_leak/OTP-12196' into maintAnders Svensson2014-12-011-6/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix remote diameter_request table leakAnders Svensson2014-09-251-6/+17
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'raimo/snmp/dev' into maintRaimo Niskanen2014-12-012-9/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Try to increase test case timeoutsRaimo Niskanen2014-09-301-1/+1
| * | | | | | | | | | Honor bind_to for manager net_if family inetRaimo Niskanen2014-09-301-8/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'hans/ssh/tar_read_and_crypto/OTP-12312' into maintHans Nilsson2014-12-014-115/+739
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ssh: Implements and tests erl_tar read from remote host.Hans Nilsson2014-12-012-23/+126
| * | | | | | | | | | ssh: crypto framework for ssh_sftp:open_tar addedHans Nilsson2014-12-012-92/+613
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'vinoski/rm-foo-dtrace' into maintMarcus Arendt2014-12-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Clean up temporary dtrace file during configSteve Vinoski2014-11-261-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ia/ssh/gracefull-termination/OTP-12185' into maintIngela Anderton Andin2014-12-011-20/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ssh: Gracefully handle bad inputIngela Anderton Andin2014-11-181-20/+30
| * | | | | | | | | Merge branch 'maint' of git-server:otp into maintIngela Anderton Andin2014-11-1335-154/+494
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'hans/eldap/timout_connect/OTP-12311' into maintHans Nilsson2014-11-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | eldap: Fix timeout missing in ssl:connectHans Nilsson2014-11-271-1/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'siri/gen_server/try-catch/OTP-12263' into maintSiri Hansen2014-11-271-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add spec for gen_server:terminate/6,7Siri Hansen2014-11-181-0/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dgud/asn1/fix-seqtag/OTP-12326' into maintDan Gudmundsson2014-11-273-22/+38
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | asn1: Fix EXTERNAL (1994 variant) type conversionDan Gudmundsson2014-11-263-22/+38
* | | | | | | | | | Merge branch 'josevalim/jv-cover-last-expr-maint/OTP-12328' into maintMarcus Arendt2014-11-272-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix cover bug on last expressions with empty clausesJosé Valim2014-11-082-1/+9
* | | | | | | | | | | Merge branch 'mururu/typespec-doc-about-function/OTP-12327' into maintMarcus Arendt2014-11-271-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add infometion about function()Yuki Ito2014-11-211-0/+3
* | | | | | | | | | | | Merge branch 'sverk/port_get_data-race/OTP-12208' into maintSverker Eriksson2014-11-262-11/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | erts: Fix port data memory allocation bugSverker Eriksson2014-11-252-11/+17
* | | | | | | | | | | | | Merge branch 'rickard/libatomic_ops_improvements/OTP-12302' into maintRickard Green2014-11-261-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
View Lorry Controller Status