Permalink
Commits on Mar 27, 2012
  1. Merge remote branch 'origin/peppe/common_test/otp-10021' into maint

    * origin/peppe/common_test/otp-10021:
      Increase test margin for user timetraps
    pekadan committed Mar 27, 2012
  2. [eldap] Add rudimentary docs

    dgud committed Mar 27, 2012
  3. Merge branch 'lukas/system/fix_ct_naming_convention' into maint

    * lukas/system/fix_ct_naming_convention:
      Rename fin_per_testcase to end_per_testcase
    garazdawi committed Mar 27, 2012
  4. Merge branch 'sa/dialyzer-R15B01-last-minute-fixes' into maint

    * 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
    Gustav Simonsson committed Mar 27, 2012
Commits on Mar 26, 2012
  1. Fix bug related with infinitely looping functions

    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.
    aronisstav committed Mar 16, 2012
  2. Up version

    kostis committed Mar 26, 2012
  3. Add warnings_as_errors option

    kostis committed Mar 26, 2012
  4. Merge branch 'ud/fix-return-do_get_disc_copy2' into maint

    * ud/fix-return-do_get_disc_copy2:
      Fixes value returned by mnesia_loader:do_get_disc_copy2/4
    
    OTP-10015
    OTP-10016
    Gustav Simonsson committed Mar 26, 2012
  5. Merge branch 'as/ssl-tls-prf-function' into maint

    * 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
    Gustav Simonsson committed Mar 26, 2012
  6. runtime_tools: Add dyntrace_SUITE

    bjorng committed Mar 20, 2012
  7. Merge remote branch 'origin/peppe/common_test/otp-9988_9871.merged' i…

    …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
    pekadan committed Mar 26, 2012
  8. Merge remote branch 'origin/peppe/common_test/otp-9973' into maint

    * origin/peppe/common_test/otp-9973:
      Update ct_master to use the Common Test CSS file for the logs
    
    OTP-9973
    pekadan committed Mar 26, 2012
  9. Merge remote branch 'origin/peppe/common_test/otp-9633' into maint

    * origin/peppe/common_test/otp-9633:
      Repair is_release_available/1
    pekadan committed Mar 26, 2012
  10. Merge remote branch 'origin/peppe/common_test/otp-10011' into maint

    * origin/peppe/common_test/otp-10011:
      Document the create_priv_dir option for ct:run_test/1
    pekadan committed Mar 26, 2012
  11. Merge branch 'anders/diameter/release_R15B01' into maint

    * anders/diameter/release_R15B01:
      Update include paths in example code
      appup for OTP-9824
      vsn -> 1.1
    Anders Svensson committed Mar 26, 2012
  12. Update include paths in example code

    Paths changed as a consequence of OTP-9638. Don't use paths under src
    however, assume an installation.
    Anders Svensson committed Mar 12, 2012
  13. appup for OTP-9824

    Anders Svensson committed Dec 14, 2011
  14. vsn -> 1.1

    Anders Svensson committed Dec 14, 2011
  15. Skip on buggy solaris

    garazdawi committed Mar 26, 2012
  16. Merge branch 'ia/ssh/shutdown-bug' into maint

    * ia/ssh/shutdown-bug:
      ssh:close/1 will no longer crash if ssl manager already happens to have been terminated.
    IngelaAndin committed Mar 26, 2012
Commits on Mar 23, 2012
  1. Merge branch 'lukas/common_test/fix_disable_builtin_hooks_from_spec/O…

    …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
    garazdawi committed Mar 23, 2012
  2. Merge branch 'peppe/common_test/otp-9871' into peppe/common_test/otp-…

    …9988_9871.merged
    
    Conflicts:
    	lib/common_test/src/ct_framework.erl
    pekadan committed Mar 23, 2012
  3. Merge branch 'siri/reltool/app-level-lib-dir/OTP-9977' into maint

    * 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
    sirihansen committed Mar 23, 2012
  4. Merge branch 'jc/omit-undefined-start_phases-3' into maint

    * 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
    sirihansen committed Mar 23, 2012
  5. Merge branch 'siri/sasl/correct-app-name-in-error/OTP-9888' into maint

    * siri/sasl/correct-app-name-in-error/OTP-9888:
      Fix error message if stdlib has faulty start type in .rel file
    sirihansen committed Mar 23, 2012
  6. Merge branch 'siri/sasl/doc-regexp-in-appup/OTP-10001' into maint

    * siri/sasl/doc-regexp-in-appup/OTP-10001:
      Add documentation of regular expressions for version numbers in appup
    sirihansen committed Mar 23, 2012