aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-02Merge branch 'maint'Hans Nilsson
2014-12-02Merge branch 'hans/ssh/appup' into maintHans Nilsson
* hans/ssh/appup: ssh: Fixes wrong version in appup file
2014-12-02ssh: Fixes wrong version in appup fileHans Nilsson
2014-12-02Merge branch 'maint'Lukas Larsson
* maint: erts: Fix finite warning for clang
2014-12-02Merge branch 'lukas/erts/isfinite-fix/OTP-12268' into maintLukas Larsson
* lukas/erts/isfinite-fix/OTP-12268: erts: Fix finite warning for clang
2014-12-02erts: Fix finite warning for clangLukas Larsson
clang aka llvm claims to be __GNUC__ and thus we have to explicitly check that it is not used.
2014-12-02Merge branch 'maint'Lukas Larsson
* maint: Sort keys before generating
2014-12-02Merge branch 'lukas/erts/bif_info_rebuild/OTP-12344' into maintLukas Larsson
* lukas/erts/bif_info_rebuild/OTP-12344: Sort keys before generating
2014-12-02Merge branch 'maint'Marcus Arendt
2014-12-02Merge branch 'tuncer/doc-fixes' into maintMarcus Arendt
* tuncer/doc-fixes: dict(3): fix typo reported by Rabbe Fogelholm Fix minor eprof and fprof doc issues
2014-12-02Merge branch 'maint'Ingela Anderton Andin
2014-12-02Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin
* ia/inets/prep-for-release: inets: Prepare for release
2014-12-02Merge branch 'ia/ssl/dialyzer/OTP-12341' into maintIngela Anderton Andin
* ia/ssl/dialyzer/OTP-12341: ssl: Prepare for release ssl: Change code to reflect that state data may be secret
2014-12-02Merge branch 'maint'Raimo Niskanen
2014-12-02Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' ↵Raimo Niskanen
into maint * raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066: [snmp/compiler] Refinement of type Opaque was not allowed MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.
2014-12-01ssl: Prepare for releaseIngela Anderton Andin
2014-12-01ssl: Change code to reflect that state data may be secretIngela Anderton Andin
2014-12-01inets: Prepare for releaseIngela Anderton Andin
2014-12-01Merge branch 'maint'Hans Nilsson
* maint: ssh: prepares appup file for release
2014-12-01Merge branch 'hans/ssh/appup' into maintHans Nilsson
* hans/ssh/appup: ssh: prepares appup file for release
2014-12-01ssh: prepares appup file for releaseHans Nilsson
2014-12-01Merge branch 'maint'Anders Svensson
2014-12-01Merge branch 'anders/diameter/filters/OTP-12308' into maintAnders Svensson
* anders/diameter/filters/OTP-12308: Order peers in pick_peer callbacks
2014-12-01Merge branch 'anders/diameter/connect_timer/OTP-12281' into maintAnders Svensson
* anders/diameter/connect_timer/OTP-12281: Tweak reason in closed event Fix ignored connect timer Check {connect,watchdog}_timer distinction in event testcases Rename reconnect_timer to connect_timer in examples and suites
2014-12-01Merge branch 'anders/diameter/3xxx/OTP-12233' into maintAnders Svensson
* anders/diameter/3xxx/OTP-12233: Fix handling of 3xxx Result-Code without E-bit
2014-12-01Merge branch 'anders/diameter/request_leak/OTP-12196' into maintAnders Svensson
* anders/diameter/request_leak/OTP-12196: Fix remote diameter_request table leak
2014-12-01Merge branch 'lemenkov/os_getenv_2/OTP-12342'Marcus Arendt
* lemenkov/os_getenv_2/OTP-12342: Introduce os:getenv/2
2014-12-01Merge branch 'maint'Raimo Niskanen
2014-12-01Merge branch 'raimo/snmp/dev' into maintRaimo Niskanen
* raimo/snmp/dev: Try to increase test case timeouts Honor bind_to for manager net_if family inet
2014-12-01[snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg
MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.
2014-12-01Merge branch 'maint'Hans Nilsson
2014-12-01Merge branch 'hans/ssh/tar_read_and_crypto/OTP-12312' into maintHans Nilsson
* hans/ssh/tar_read_and_crypto/OTP-12312: ssh: Implements and tests erl_tar read from remote host. ssh: crypto framework for ssh_sftp:open_tar added
2014-12-01ssh: Implements and tests erl_tar read from remote host.Hans Nilsson
2014-12-01ssh: crypto framework for ssh_sftp:open_tar addedHans Nilsson
2014-12-01Merge branch 'maint'Marcus Arendt
2014-12-01Merge branch 'vinoski/rm-foo-dtrace' into maintMarcus Arendt
* vinoski/rm-foo-dtrace: Clean up temporary dtrace file during config
2014-12-01Merge branch 'maint'Ingela Anderton Andin
2014-12-01Merge branch 'ia/ssh/gracefull-termination/OTP-12185' into maintIngela Anderton Andin
* ia/ssh/gracefull-termination/OTP-12185: ssh: Gracefully handle bad input
2014-11-30dict(3): fix typo reported by Rabbe FogelholmTuncer Ayaz
2014-11-29Fix minor eprof and fprof doc issuesTuncer Ayaz
2014-11-28Merge branch 'maint'Hans Nilsson
* maint: eldap: Fix timeout missing in ssl:connect
2014-11-28Merge branch 'hans/eldap/timout_connect/OTP-12311' into maintHans Nilsson
* hans/eldap/timout_connect/OTP-12311: eldap: Fix timeout missing in ssl:connect
2014-11-28Merge branch 'maint'Siri Hansen
2014-11-28Merge branch 'vladdu/jinterface_format/OTP-12333'Marcus Arendt
* vladdu/jinterface_format/OTP-12333: [jinterface] cleanup code according to new style [jinterface] add Eclipse projects and settings
2014-11-27eldap: Fix timeout missing in ssl:connectHans Nilsson
2014-11-27Merge branch 'siri/gen_server/try-catch/OTP-12263' into maintSiri Hansen
* siri/gen_server/try-catch/OTP-12263: Add spec for gen_server:terminate/6,7
2014-11-27Order peers in pick_peer callbacksAnders Svensson
The order of peers presented to a diameter_app(3) pick_peer callback has previously not been documented, but there are use cases that are simplified by an ordering. For example, consider preferring a direct connection to a specified Destination-Host/Realm to any host in the realm. The implementation previously treated this as a special case by placing matching hosts at the head of the peers list, but the documentation made no guarantees. Now present peers in match-order, so that the desired sorting is the result of the following filter. {any, [{all, [host, realm]}, realm]} The implementation is not backwards compatible in the sense that a realm filter alone is no longer equivalent in this case. However, as stated, the documentation never made any guarantees regarding the sorting.
2014-11-27Merge branch 'maint'Dan Gudmundsson
2014-11-27Merge branch 'dgud/asn1/fix-seqtag/OTP-12326' into maintDan Gudmundsson
* dgud/asn1/fix-seqtag/OTP-12326: asn1: Fix EXTERNAL (1994 variant) type conversion
2014-11-27Merge branch 'maint'Marcus Arendt
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 12:31:13 +0000