aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-02Merge branch 'egil/fix-dialyzer-map-key-coalescing/OTP-12347' into maintBjörn-Egil Dahlberg
* egil/fix-dialyzer-map-key-coalescing/OTP-12347: dialyzer: Test recoalesced map keys compiler: Coalesce map keys in dialyzer mode
2014-12-02Merge branch 'anders/diameter/17.4_release/OTP-12343' into maintAnders Svensson
* anders/diameter/17.4_release/OTP-12343: vsn -> 1.8 Update appup for 17.4
2014-12-02Merge branch 'siri/ct_netconfc/subsystem-timeout/OTP-12334' into maintHenrik Nord
* siri/ct_netconfc/subsystem-timeout/OTP-12334: [ct_netconfc] Handle timeout failure in ssh
2014-12-02Merge branch 'siri/ct_telnet/unstable-tests/OTP-12329' into maintHenrik Nord
* siri/ct_telnet/unstable-tests/OTP-12329: [ct_telnet] Fix test case 'server_speaks' [ct_telnet] Improve debug printouts and logging [ct_telnet] Add timestamp to telnet_server debug printout [ct_telnet] Extend timeout in test from 1 to 2 sek [ct_telnet] Don't send extra newline after password
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 '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 '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 '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 '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 '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-01vsn -> 1.8Anders Svensson
2014-12-01Update appup for 17.4Anders Svensson
OTP-12196 remote request table leak OTP-12233 3xxx result code without E-bit OTP-12281 ignored connect_timer OTP-12308 filter ordering
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 '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-01dialyzer: Test recoalesced map keysBjörn-Egil Dahlberg
2014-12-01compiler: Coalesce map keys in dialyzer modeBjörn-Egil Dahlberg
This fixes a regression introduced in commit 805f9c89fc01220bc1bb0f27e1b68fd4eca688ba The problem occured with map keys compiled with dialyzer option turned on. In OTP 17, map keys needs to be literals.
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 '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 '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 'vinoski/rm-foo-dtrace' into maintMarcus Arendt
* vinoski/rm-foo-dtrace: Clean up temporary dtrace file during config
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 'hans/eldap/timout_connect/OTP-12311' into maintHans Nilsson
* hans/eldap/timout_connect/OTP-12311: eldap: Fix timeout missing in ssl:connect
2014-11-27eldap: Fix timeout missing in ssl:connectHans Nilsson
2014-11-27[ct_netconfc] Handle timeout failure in sshSiri Hansen
ssh_connection:subsystem/4 can return success | failure | {error,timeout}. The latter was not handled by ct_netconfc.erl. This is now corrected.
2014-11-27[ct_telnet] Fix test case 'server_speaks'Siri Hansen
This test case simulates that the server spontaneously sends data. By changing ct_telnet:send to ct_telnet_client:send_data this simulations makes more sense - since client's buffers are not flushed. Also removed the newline at the end of "echo_no_prompt" command. Since newline is added automatically, the explicit newline at the end of the command causes a prompt to be sent which is not expected.
2014-11-27[ct_telnet] Improve debug printouts and loggingSiri Hansen
ct_telnet_own_server_SUITE:large_string sometimes fail in the last attempt - where get_data is used to fetch smaller chunks - probably because one get_data message towards ct_telnet_client returns without having received any new data. This commit adds timestamps to debug printouts and improves the logging.
2014-11-27[ct_telnet] Add timestamp to telnet_server debug printoutSiri Hansen
This is the telnet server used when testing ct_telnet and friends. The telnet client itself is not changed.
2014-11-27[ct_telnet] Extend timeout in test from 1 to 2 sekSiri Hansen
This is for stabilizing test cases.
2014-11-27[ct_telnet] Don't send extra newline after passwordSiri Hansen
The telnet client used to send an extra newline after the password. This caused an extra prompt to be sent back from the server. Some test cases failed every now and then due to this - since the second promt was confusing. This is now corrected, i.e. the client does no longer send an extra newline after the password.
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 '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 'josevalim/jv-cover-last-expr-maint/OTP-12328' into maintMarcus Arendt
* josevalim/jv-cover-last-expr-maint/OTP-12328: Fix cover bug on last expressions with empty clauses
2014-11-27Merge branch 'mururu/typespec-doc-about-function/OTP-12327' into maintMarcus Arendt
* mururu/typespec-doc-about-function/OTP-12327: Add infometion about function()
2014-11-26Merge branch 'sverk/port_get_data-race/OTP-12208' into maintSverker Eriksson
* sverk/port_get_data-race/OTP-12208: erts: Fix port data memory allocation bug
2014-11-26asn1: Fix EXTERNAL (1994 variant) type conversionDan Gudmundsson
Missed to add seqtag handling for EXTERNAL type conversion, bug introduced in c266196c016fc1156c7a18cfeec4920ee4075519