aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-04-18Merge branch 'maint'Björn Gustavsson
* maint: Prepare release Prepare release Do not count offline run-queues as empty Prepare release Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters
2013-04-18Merge branch 'maint-r16' into maintBjörn Gustavsson
* maint-r16: Prepare release Prepare release Do not count offline run-queues as empty Prepare release Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters Conflicts: erts/vsn.mk
2013-04-18Merge branch 'maint-r15' into maint-r16Björn Gustavsson
* maint-r15: Prepare release Dummy merge.
2013-04-18Prepare releaseErlang/OTP
2013-04-18Merge branch 'rickard/sched/OTP-11022' into maint-r16Erlang/OTP
* rickard/sched/OTP-11022: Do not count offline run-queues as empty
2013-04-18Prepare releaseErlang/OTP
2013-04-18Merge branch 'maint'Siri Hansen
2013-04-18Merge branch 'siri/ct/error-printout-link/OTP-11044' into maintSiri Hansen
* siri/ct/error-printout-link/OTP-11044: [common_test] Add link from red error notification to full error description [common_test] Use max importance when logging errors
2013-04-18Merge branch 'maint'Siri Hansen
2013-04-18Merge branch 'siri/doc-fnu-opts/OTP-10901' into maintSiri Hansen
* siri/doc-fnu-opts/OTP-10901: Add documentation of w, i and e addition to +fnu and +fna switches to erl
2013-04-18Merge branch 'maint'Fredrik Gustafsson
2013-04-18Merge branch 'fredrik/inets/unblock_timer' into maintFredrik Gustafsson
* fredrik/inets/unblock_timer: inets: stop block timer with the right arguments
2013-04-17Add documentation of w, i and e addition to +fnu and +fna switches to erlSiri Hansen
These were documented in the stdlib user's guide, but not in the reference manual for erl. This has now been corrected.
2013-04-17Merge branch 'maint'Peter Andersson
2013-04-17Merge branch 'peppe/common_test/log_cache2' into maintPeter Andersson
* peppe/common_test/log_cache2: Bug fixes in Common Test log cache
2013-04-17Bug fixes in Common Test log cachePeter Andersson
2013-04-17Merge branch 'siri/appup-for-r17/OTP-10950'Siri Hansen
* siri/appup-for-r17/OTP-10950: Update "old vsn" in sasl test to R15 instead of R14 (two back from R17)
2013-04-17Update "old vsn" in sasl test to R15 instead of R14 (two back from R17)Siri Hansen
2013-04-17Merge branch 'maint'Peter Andersson
2013-04-17Merge branch 'peppe/common_test/log_cache' into maintPeter Andersson
* peppe/common_test/log_cache: Implement cache for the CT logger OTP-10855
2013-04-17Implement cache for the CT loggerPeter Andersson
OTP-10855
2013-04-17Merge branch 'maint'Björn Gustavsson
* maint: Encode Erlang source files with non-ascii characters in UTF-8
2013-04-17Merge branch 'bjorn/fix-encoding/OTP-11041' into maintBjörn Gustavsson
* bjorn/fix-encoding/OTP-11041: Encode Erlang source files with non-ascii characters in UTF-8
2013-04-17Encode Erlang source files with non-ascii characters in UTF-8Björn Gustavsson
To ensure that 'master' compiles when we merge 'maint' to it, regardless of which encoding is default in 'master', all source files with non-ascii characters *must* have the encoding specified.
2013-04-16Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r16Erlang/OTP
* bjorn/asn1/fix-lost-extension-mark/OTP-10995: Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters
2013-04-16Do not count offline run-queues as emptyRickard Green
2013-04-16[common_test] Add link from red error notification to full error descriptionSiri Hansen
In test case log, the red error notification may sometimes be truncated. This commit adds a link from this printout to the end of the log where the full error description and stacktrace i written.
2013-04-16[common_test] Use max importance when logging errorsSiri Hansen
This commit adds ?MAX_IMPORTANCE to error notifications in the test case log, and it makes sure that the printout says "CT Error Notification". Printouts from cth_log_redirect (sasl and error_reports) uses ?STD_IMPORTANCE and states "System" in the printout.
2013-04-16Merge branch 'siri/appup-for-r17/OTP-10950'Siri Hansen
* siri/appup-for-r17/OTP-10950: Update sasl version and sasl.appup.src for R17 Update stdlib.appup.src for R17 Update kernel.appup.src for R17
2013-04-15Update sasl version and sasl.appup.src for R17Siri Hansen
Also clean up appup_test in sasl_SUITE by removing old versions that are no longer used.
2013-04-15Update stdlib.appup.src for R17Siri Hansen
2013-04-15Update kernel.appup.src for R17Siri Hansen
2013-04-15Prepare releaseErlang/OTP
2013-04-15Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r15Erlang/OTP
* bjorn/asn1/fix-lost-extension-mark/OTP-10995: Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters
2013-04-15Merge branch 'maint'Fredrik Gustafsson
2013-04-15Merge branch 'jaf/fix-supervisor-multi-restart/OTP-11042' into maintFredrik Gustafsson
2013-04-15Merge branch 'maint'Fredrik Gustafsson
2013-04-15Merge branch 'lh/demonitor-flush/OTP-11039' into maintFredrik Gustafsson
* lh/demonitor-flush/OTP-11039: Use erlang:demonitor(Ref, [flush]) where applicable
2013-04-15Merge branch 'maint'Fredrik Gustafsson
2013-04-15Merge branch 'nox/file-receive-optim/OTP-11040' into maintFredrik Gustafsson
* nox/file-receive-optim/OTP-11040: Optimize communication with file io server
2013-04-15inets: stop block timer with the right argumentsFredrik Gustafsson
2013-04-12Merge branch 'maint'Anders Svensson
2013-04-12Merge branch 'anders/diameter/watchdog_leak/OTP-11019' into maintAnders Svensson
* anders/diameter/watchdog_leak/OTP-11019: Minor doc fix Add testcase to exercise reconnect behaviour Fix watchdog table leak
2013-04-12Merge branch 'anders/diameter/address_config/OTP-10986' into maintAnders Svensson
* anders/diameter/address_config/OTP-10986: Comment fix More robust listening port lookup in test suites Update example client to allow default local address Make explicit local address to diameter_tcp:start/3 optional Add transport interface 'connected' message with local address list
2013-04-11Minor doc fixAnders Svensson
2013-04-11Add testcase to exercise reconnect behaviourAnders Svensson
2013-04-11Merge branch 'maint'Fredrik Gustafsson
2013-04-11Merge branch 'lh/otp-optims/OTP-11035' into maintFredrik Gustafsson
* lh/otp-optims/OTP-11035: Use erlang:demonitor's flush option on timeout Don't lookup the node unless required in gen:call/{3,4}
2013-04-11Merge branch 'maint'Fredrik Gustafsson
2013-04-11Merge branch 'fredrik/ct/telnet_wo_line_breaks/OTP-10085' into maintFredrik Gustafsson