* origin/peppe/common_test/otp-10021: Increase test margin for user timetraps
* lukas/system/fix_ct_naming_convention: Rename fin_per_testcase to end_per_testcase
* sa/dialyzer-R15B01-last-minute-fixes: Fix bug related with infinitely looping functions Report only actual unknown types otherwise no message is sent Use wx:wx_object() type now that it is exported Up version Add warnings_as_errors option
Depending of the ordering of the functions during dataflow, a function with an infinite loop might be identified as one that always crashes. This is fixed now, by allowing restoration of the infinitely-looping status.
* ud/fix-return-do_get_disc_copy2: Fixes value returned by mnesia_loader:do_get_disc_copy2/4 OTP-10015 OTP-10016
* as/ssl-tls-prf-function: Some protocols (e.g. EAP-PEAP, EAP-TLS, EAP-TTLS) that use TLS as transport layer need to generate additional application specific key material One way to generate such material is to use the TLS PRF and key material from the TLS session itself OTP-10024
…nto maint * origin/peppe/common_test/otp-9988_9871.merged: Fix various problems with the user timetrap implementation Fix dialyzer reported errors Implement support for user controlled timetraps OTP-9988
* origin/peppe/common_test/otp-9973: Update ct_master to use the Common Test CSS file for the logs OTP-9973
* origin/peppe/common_test/otp-9633: Repair is_release_available/1
* origin/peppe/common_test/otp-10011: Document the create_priv_dir option for ct:run_test/1
* anders/diameter/release_R15B01: Update include paths in example code appup for OTP-9824 vsn -> 1.1
Paths changed as a consequence of OTP-9638. Don't use paths under src however, assume an installation.
* ia/ssh/shutdown-bug: ssh:close/1 will no longer crash if ssl manager already happens to have been terminated.
…TP-10009' into maint * lukas/common_test/fix_disable_builtin_hooks_from_spec/OTP-10009: Change default of enable builtin hooks to undefined Disable built in hooks for emulator
…9988_9871.merged Conflicts: lib/common_test/src/ct_framework.erl
* siri/reltool/app-level-lib-dir/OTP-9977: [reltool] Allow lib_dir on app level to use relative path [reltool] Add configuration parameter lib_dir on application level
* jc/omit-undefined-start_phases-3: Avoid undefined start_phases entry in .script Avoid creating an undefined start_phases entry when generating a release OTP-10003
* siri/sasl/correct-app-name-in-error/OTP-9888: Fix error message if stdlib has faulty start type in .rel file
* siri/sasl/doc-regexp-in-appup/OTP-10001: Add documentation of regular expressions for version numbers in appup