aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-20Merge branch 'maint'Peter Andersson
2012-11-20Merge remote branch 'origin/peppe/common_test/config_broken_r15b03' into maintPeter Andersson
* origin/peppe/common_test/config_broken_r15b03: Fix problem with config start option not accepting list of files OTP-10495
2012-11-19Fix bad assertRickard Green
2012-11-19Merge branch 'maint'Anders Svensson
2012-11-19Merge branch 'anders/diameter/R15B03_release/OTP-10582' into maintAnders Svensson
* anders/diameter/R15B03_release/OTP-10582: vsn -> 1.3 Update appup for R15B03 Dialyzer fix Insert missing 1.1 release notes Minor test suite tweaks vsn -> 1.2.1 Update appup for OTP-10461/10550
2012-11-19Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-19vsn -> 1.3Anders Svensson
2012-11-19Update appup for R15B03Anders Svensson
2012-11-19Dialyzer fixAnders Svensson
The removed clause was added in commit c14ef2db as part of an aborted implementation.
2012-11-19Insert missing 1.1 release notesAnders Svensson
2012-11-19Minor test suite tweaksAnders Svensson
2012-11-19vsn -> 1.2.1Anders Svensson
2012-11-19Update appup for OTP-10461/10550Anders Svensson
2012-11-19Merge branch 'ia/ssl/dialyzer-found-bug' into maintIngela Anderton Andin
* ia/ssl/dialyzer-found-bug: ssl: Fix bug in match expression found by Dialyzer
2012-11-19Merge branch 'maint'Anders Svensson
2012-11-19Merge branch 'anders/diameter/code_pre/OTP-10583' into maintAnders Svensson
* anders/diameter/code_pre/OTP-10583: Fix broken doc links Generate intra-document references Remove superfluous function markers Use entities for cross references Add entities file for cross-references (mostly) <code> -> <pre> in documentation
2012-11-19ssl: Fix bug in match expression found by DialyzerIngela Anderton Andin
Code should handle case the there is some undelivered data left on the socket when peer close signal is received. It is unlikely that this happens during normal testing.
2012-11-19Merge branch 'maint'Lars Thorsen
* maint: [erl_docgen] Updated the vsn.mk [erl_docgen] Add db_eix.xsl to the Makefile [safs] Add pdfname to the html target for the users guide [erl_docgen] Add possibility to specify pdf filename Updated system/doc/Makefile with the new xsltproc options. A possibility to configure erl_docgen so it can generate documentation for other products than Erlang/OTP.
2012-11-19Merge branch 'lars/erl_docgen/configurable_doc_build/OTP-9040' into maintLars Thorsen
* lars/erl_docgen/configurable_doc_build/OTP-9040: [erl_docgen] Updated the vsn.mk [erl_docgen] Add db_eix.xsl to the Makefile [safs] Add pdfname to the html target for the users guide [erl_docgen] Add possibility to specify pdf filename Updated system/doc/Makefile with the new xsltproc options. A possibility to configure erl_docgen so it can generate documentation for other products than Erlang/OTP. OTP-9040
2012-11-19Fix problem with config start option not accepting list of filesPeter Andersson
OTP-10495
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-18Fix broken doc linksAnders Svensson
2012-11-18Generate intra-document referencesAnders Svensson
2012-11-18Remove superfluous function markersAnders Svensson
2012-11-18Use entities for cross referencesAnders Svensson
2012-11-18Add entities file for cross-references (mostly)Anders Svensson
Saves typing, more readable, less error prone.
2012-11-18<code> -> <pre> in documentationAnders Svensson
The former doesn't allow seealso content, which erl_docgen doesn't enforce, resulting in mangled PDF.
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-16[erl_docgen] Updated the vsn.mkLars Thorsen
2012-11-16[erl_docgen] Add db_eix.xsl to the MakefileLars Thorsen
2012-11-16[safs] Add pdfname to the html target for the users guideLars Thorsen
2012-11-16[erl_docgen] Add possibility to specify pdf filenameLars Thorsen
2012-11-16Updated system/doc/Makefile with the new xsltproc options.Lars Thorsen
2012-11-16A possibility to configure erl_docgen so it can generate documentation for ↵Lars Thorsen
other products than Erlang/OTP.
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