aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-19Merge branch 'siri/test_server/break-in-end_per_testcase/OTP-10046'Siri Hansen
* siri/test_server/break-in-end_per_testcase/OTP-10046: [test_server] Cancel timetrap for break in end_per_testcase
2012-11-19Merge branch 'siri/runtime_tools/dyntrace-dialyzer-warnings/OTP-10402'Siri Hansen
* siri/runtime_tools/dyntrace-dialyzer-warnings/OTP-10402: Fix dialyzer warning in dyntrace.erl
2012-11-18Merge branch 'maint'Anders Svensson
2012-11-18Merge branch 'anders/diameter/CEA_timeout/OTP-10554' into maintAnders Svensson
* anders/diameter/CEA_timeout/OTP-10554: Implement transport_opt() capx_timeout Document transport_opt() capx_timeout Minor doc fixes
2012-11-18Merge branch 'anders/diameter/identifier_checks/OTP-10565' into maintAnders Svensson
* anders/diameter/identifier_checks/OTP-10565: Add comment about lack of identifier checks on DWA Add check of End-to-End and Hop-by-Hop identfiers in received DPA Add check of End-to-End and Hop-by-Hop identfiers in received CEA
2012-11-18Merge branch 'anders/diameter/transport_data/OTP-10566' into maintAnders Svensson
* anders/diameter/transport_data/OTP-10566: Add a testcase Allow a handle_request callback to return a #diameter_packet{}
2012-11-18Merge branch 'anders/diameter/transport_shutdown/OTP-10493' into maintAnders Svensson
* anders/diameter/transport_shutdown/OTP-10493: Add simple DPR suite Correct diameter:remove_transport/2 doc Fix broken doc link Ensure watchdog dies with transport if DPR was sent Remove dead clause Implement transport_opt() disconnect_cb Document transport_opt() disconnect_cb
2012-11-18Merge branch 'anders/diameter/service_events/OTP-10492' into maintAnders Svensson
* anders/diameter/service_events/OTP-10492: Add start/stop service_event()
2012-11-16Add start/stop service_event()Anders Svensson
2012-11-16Merge branch 'fredrik/ssh/timer-on-connect/OTP-10514'Fredrik Gustafsson
* fredrik/ssh/timer-on-connect/OTP-10514: New setup in testing idle_time Use same connect as the rest of testcases Fixed doc Added testcase for idle timer Not start the idle timer on connect Doc about idle_time option to ssh:connect Check cache on channel exec handle no idle-timer on check cache Option idle_time introduced, it will trigger the timer and if it is not given the timer_ref entry is infinity Timeout after 1h of idle on connection, which exits the connection Conflicts: lib/ssh/src/ssh.erl
2012-11-16Merge branch 'pan/erlang-spec-error/open_port'Patrik Nyblom
* pan/erlang-spec-error/open_port: Fix spec for erlang:process_info/{1,2} Add 'hide' option to erlang:open_port/2 spec * Update preloaded erlang.beam OTP-10584 OTP-9684
2012-11-16Fix spec for erlang:process_info/{1,2}Patrik Nyblom
2012-11-16Add 'hide' option to erlang:open_port/2 specPatrik Nyblom
2012-11-16Merge branch 'maint'Fredrik Gustafsson
* maint: Increased waiting time to check if socket is down Fine adjustments of slowdos alg Changes to slowdos testcase Doc for test case slowdose Bumped version nr Added testcases för minimum_bytes_per_second option Reduced checking of bytes per second to every second Documentation for minimum_bytes_per_seconds option Changed property to minimum_bytes_per_second and checking if is integer on start Changed to Bytes Per Second when checking clients rate, new options {byte_limit, integer()} Option {bit_limit, integer()} to close sockets where clients are too slow
2012-11-16Merge branch 'fredrik/inets/slowdos/OTP-10392' into maintFredrik Gustafsson
* fredrik/inets/slowdos/OTP-10392: Increased waiting time to check if socket is down Fine adjustments of slowdos alg Changes to slowdos testcase Doc for test case slowdose Bumped version nr Added testcases för minimum_bytes_per_second option Reduced checking of bytes per second to every second Documentation for minimum_bytes_per_seconds option Changed property to minimum_bytes_per_second and checking if is integer on start Changed to Bytes Per Second when checking clients rate, new options {byte_limit, integer()} Option {bit_limit, integer()} to close sockets where clients are too slow
2012-11-16[test_server] Cancel timetrap for break in end_per_testcaseSiri Hansen
Any call to test_server:break/1 should cancel all active timetramps. In some cases, Suite:end_per_testcase/2 is executed on a different process than the test case itself, and if test_server:break/1 would be called from there, the timetraps would not be cancelled. This has been corrected.
2012-11-16Merge branch 'maint'Fredrik Gustafsson
* maint: Appup changes for SSH
2012-11-16Merge branch 'fredrik/ssh-version-fixes' into maintFredrik Gustafsson
* fredrik/ssh-version-fixes: Appup changes for SSH
2012-11-16Appup changes for SSHFredrik Gustafsson
2012-11-16Merge branch 'maint'Fredrik Gustafsson
* maint: Fixed if it is not the record to read from in read_password Fixed user interaction ssh
2012-11-16Merge branch 'fredrik/ssh/user-input/OTP-10513' into maintFredrik Gustafsson
* fredrik/ssh/user-input/OTP-10513: Fixed if it is not the record to read from in read_password Fixed user interaction ssh
2012-11-16Fixed if it is not the record to read from in read_passwordFredrik Gustafsson
2012-11-16Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-16Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maintIngela Anderton Andin
* ia/public_key/Additional-PKCS-support/OTP-10509: Prepare for release public_key: Add PKCS-10 documentation and PKCS-7 test case public_key: Simplified PKCS-7 and PKCS-10 specs. public_key: Added PKCS-10 public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS. public_key: Add PKCS-7
2012-11-16Prepare for releaseIngela Anderton Andin
2012-11-16public_key: Add PKCS-10 documentation and PKCS-7 test caseIngela Anderton Andin
Note that PKCS-7 is an undocumented feature for now. Also added some minor enhancements to the documentation.
2012-11-16Merge branch 'maint'Patrik Nyblom
2012-11-16Merge branch 'pan/r15/erlang-spec-error/process_info' into maintPatrik Nyblom
* pan/r15/erlang-spec-error/process_info: Correct spec for erlang:process_info(Pid,links) OTP-10584
2012-11-16Correct spec for erlang:process_info(Pid,links)Patrik Nyblom
2012-11-16Merge branch 'maint'Patrik Nyblom
2012-11-16Merge branch 'pan/port_driver_tutorial/OTP-10573' into maintPatrik Nyblom
* pan/port_driver_tutorial/OTP-10573: Bring driver tutorial up to date.
2012-11-16Bring driver tutorial up to date.Patrik Nyblom
2012-11-16Merge branch 'maint'Rickard Green
* maint: Add clearer warnings about misuse of NIF and driver functionality Fix erlang:memory(ets) Conflicts: erts/emulator/beam/erl_db.c
2012-11-16Merge branch 'rickard/native-doc/OTP-10557' into maintRickard Green
* rickard/native-doc/OTP-10557: Add clearer warnings about misuse of NIF and driver functionality
2012-11-16Merge branch 'rickard/ets-mem-bug/OTP-10558' into maintRickard Green
* rickard/ets-mem-bug/OTP-10558: Fix erlang:memory(ets)
2012-11-15Add clearer warnings about misuse of NIF and driver functionalityRickard Green
2012-11-15Implement transport_opt() capx_timeoutAnders Svensson
2012-11-15Document transport_opt() capx_timeoutAnders Svensson
2012-11-15Minor doc fixesAnders Svensson
Presentation (order, cross-references), not content.
2012-11-15Add comment about lack of identifier checks on DWAAnders Svensson
2012-11-15Add check of End-to-End and Hop-by-Hop identfiers in received DPAAnders Svensson
2012-11-15Add check of End-to-End and Hop-by-Hop identfiers in received CEAAnders Svensson
2012-11-15Add a testcaseAnders Svensson
2012-11-15Allow a handle_request callback to return a #diameter_packet{}Anders Svensson
This allows it to set transport_data and header, inappropriately so even.
2012-11-15Add simple DPR suiteAnders Svensson
2012-11-15Correct diameter:remove_transport/2 docAnders Svensson
Error can be returned if the service process goes down while remove_transport is ongoing.
2012-11-15Fix broken doc linkAnders Svensson
Broken in commit e28ced7b.
2012-11-15Ensure watchdog dies with transport if DPR was sentAnders Svensson
A watchdog timeout after DPR but before DPA would previously result in the watchdog restarting the transport.
2012-11-15Remove dead clauseAnders Svensson
Long dead.
2012-11-15Implement transport_opt() disconnect_cbAnders Svensson