aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-02-04Revert "Prepare release"Fredrik Gustafsson
This reverts commit a0e362765d9d4afb0211f49eb787d2139b3eb7be.
2013-01-17Merge tag 'build/maint-r15/2013-01-14_20.31' into maint-r15Fredrik Gustafsson
2013-01-15Update release notesErlang/OTP
2013-01-15Merge branch 'anders/diameter/eval_clause/OTP-10685' into maint-r15Erlang/OTP
* anders/diameter/eval_clause/OTP-10685: vsn -> 1.3.1 Update appup Traffic suite comments plus a minor match tweak Add a testcase Reverse swapped arguments
2013-01-15vsn -> 1.3.1Anders Svensson
2013-01-15Update appupAnders Svensson
2013-01-15Traffic suite comments plus a minor match tweakAnders Svensson
2013-01-15Add a testcaseAnders Svensson
2013-01-14Reverse swapped argumentsAnders Svensson
The fault caused a handle_request callback to fail whenever an eval tuple was returned. Introduced in commit f24adb28.
2013-01-07Prepare releaseErlang/OTP
2013-01-07Merge branch 'fredrik/ssh/appup-r15b03-patch' into maint-r15Erlang/OTP
* fredrik/ssh/appup-r15b03-patch: Fixed syntax appup ssh Teach Win installer to handle redist on w2012/w8
2013-01-07Fixed syntax appup sshFredrik Gustafsson
2012-12-17Merge branch 'maint-r15' into maintSiri Hansen
2012-12-12Prepare releaseErlang/OTP
2012-12-12Merge branch 'siri/common_test/surefire-for-nci/OTP-10589' into maint-r15Erlang/OTP
* siri/common_test/surefire-for-nci/OTP-10589: [common_test] Add documentation of new url_base option to cth_surefire [common_test] Fix cth_surefire
2012-12-12[common_test] Add documentation of new url_base option to cth_surefireSiri Hansen
2012-12-12[common_test] Fix cth_surefireSiri Hansen
The following corrections/changes are done in the cth_surefire hook: * Earlier there would always be a 'properties' element under the 'testsuites' element. This would exist even if there were now 'property' element inside it. This has been changed so if there are no 'property' elements to display, then there will not be a 'properties' element either. * The XML file will now (unless other is specified) be stored in the top log directory. Earlier, the default directory would be the current working directory for the erlang node, which would mostly, but not always, be the top log directory. * The 'hostname' attribute in the 'testsuite' element would earlier never have the correct value. This has been corrected. * The 'errors' attribute in the 'testsuite' element would earlier display the number of failed testcases. This has been changed and will now always have the value 0, while the 'failures' attribute will show the number of failed testcases. * A new attribute 'skipped' is added to the 'testsuite' element. This will display the number of skipped testcases. These would earlier be included in the number of failed test cases. * The total number of tests displayed by the 'tests' attribute in the 'testsuite' element would earlier include init/end_per_suite and init/end_per_group. This is no longer the case. The 'tests' attribute will now only count "real" test cases. * Earlier, auto skipped test cases would have no value in the 'log' attribute. This is now corrected. * A new attributes 'log' is added to the 'testsuite' element. * A new option named 'url_base' is added for this hook. If this option is used, a new attribute named 'url' will be added to the 'testcase' and 'testsuite' elements. Tests are added for the ct_surefire hook.
2012-12-06Merge tag 'erl_1219' into maintOTP_R15B03-1Björn-Egil Dahlberg
erts: Patch 1219 OTP-10602 Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed). Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed). This changes the behaviour back to the R15B02 default considering if a beam was running with no heart.
2012-12-06Merge tag 'erl_1218' into maintBjörn-Egil Dahlberg
ssl: Patch 1218 OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored
2012-12-06Prepare releaseErlang/OTP
2012-12-06Merge branch 'egil/fix-crashdump-default/OTP-10602' into maint-r15Erlang/OTP
* egil/fix-crashdump-default/OTP-10602: erts: Change default of erl_crash.dump
2012-12-06Update release notesErlang/OTP
2012-12-06Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15Erlang/OTP
* egil/ia/ssl/accept-timeout/OTP-10600: ssl: Prepare for release ssl: Export sslsocket() dialyzer type ssl: Cancel non expired timers ssl: Fix recv after timeout expired ssl: Timeout handling changed so that the fsm-process will terminate if the ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires.
2012-12-06ssl: Prepare for releaseIngela Anderton Andin
2012-12-06ssl: Export sslsocket() dialyzer typeIngela Anderton Andin
2012-12-06ssl: Cancel non expired timersIngela Anderton Andin
2012-12-06ssl: Fix recv after timeout expiredIngela Anderton Andin
Reset state so that "recv data" is not sent as "active data" after a recv timed out and no new recv has been called.
2012-12-06ssl: Timeout handling changed so that the fsm-process will terminate if the ↵Ingela Anderton Andin
ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires. Add missing function clause to handle timeout during handshake. The missing clause had the effect that the timeout was wrongly discarded. Also add an extra test case for the recv timeout in addition to the one in ssl_packet_SUITE. The missing functions clause was introduced in 8a789189. This commit changed the timeout implementation, the previous implememtation could cause other type of problems as the timeout was client side.
2012-11-30erts: Change default of erl_crash.dumpBjörn-Egil Dahlberg
* Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed) * Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed) This changes the behaviour back to the R15B02 default considering if a beam was running with no heart. The motivation is that we want a fast heart to fast restart erlang if it crashes but to be able to get non-truncated erl_crash.dumps via setting ERL_CRASH_DUMP_SECONDS if we so desire.
2012-11-28Merge branch 'pan/win2012_installer' into maintPatrik Nyblom
* pan/win2012_installer: Teach Win installer to handle redist on w2012/w8 OTP-10598
2012-11-27Teach Win installer to handle redist on w2012/w8Patrik Nyblom
Also made check for DLL version against redistributables instead of towards installed system, as some builds required redistributables everytime (installed dll on build machine had higher version than the redist)...
2012-11-26Prepare releaseOTP_R15B03Erlang/OTP
2012-11-26Merge branch 'egil/fix-heart-unregister' into maintBjörn-Egil Dahlberg
* egil/fix-heart-unregister: kernel: Heart port needs to be unregistered
2012-11-26Merge branch 'raimo/daily-build-fixes' into maintRaimo Niskanen
* raimo/daily-build-fixes: Fix erroneous skipping for jinterface, erl_interface and ic
2012-11-26Fix erroneous skipping for jinterface, erl_interface and icRaimo Niskanen
2012-11-23kernel: Heart port needs to be unregisteredBjörn-Egil Dahlberg
When heart cycles we need to unregister the old port before starting the new heart port program. OTP-10591
2012-11-23Update preloaded modulesBjörn-Egil Dahlberg
2012-11-23Update primary bootstrapBjörn-Egil Dahlberg
2012-11-23Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maintPatrik Nyblom
* pan/process_info_spec_doc/r15/OTP-10584: Correct doc of process_info(Pid,links) OTP-10584
2012-11-23Merge branch 'pan/bs_append_crash' into maintPatrik Nyblom
* pan/bs_append_crash: Teach erts_bs_append not to dump core OTP-10590
2012-11-23Merge branch 'anders/diameter/doc/OTP-10568' into maintAnders Svensson
* anders/diameter/doc/OTP-10568: Update doc for RFC 6733 Add copies of RFC's 6733 and 6737
2012-11-23Merge branch 'anders/diameter/doc/OTP-10471' into maintAnders Svensson
* anders/diameter/doc/OTP-10471: Add missing diameter_codec(3) content Add content to diameter_codec(3) and diameter_make(3) Add reference pages diameter_codec(3) and diameter_make(3)
2012-11-23Update copyright yearsBjörn-Egil Dahlberg
2012-11-23Add missing diameter_codec(3) contentAnders Svensson
2012-11-23Merge branch 'peppe/common_test/group_search_r15b03.fix' into maintPeter Andersson
* peppe/common_test/group_search_r15b03.fix: Fix silly bug
2012-11-23Fix silly bugPeter Andersson
2012-11-23Merge branch 'egil/fix-crash_dump-lc-assert' into maintBjörn-Egil Dahlberg
* egil/fix-crash_dump-lc-assert: erts: Suppress lock assertion when dumping a crash
2012-11-22Update doc for RFC 6733Anders Svensson
2012-11-22Add copies of RFC's 6733 and 6737Anders Svensson
6733 deprecates 3588.
2012-11-22Add content to diameter_codec(3) and diameter_make(3)Anders Svensson