Skip to content
Commits on Oct 27, 2014
  1. Merge branch 'maint'

    Marcus Arendt committed Oct 27, 2014
  2. Merge branch 'knewter/bugfix/typo_in_wx_demo' into maint

    * knewter/bugfix/typo_in_wx_demo:
      wx: Fix typo in graphicsContext example
    Marcus Arendt committed Oct 27, 2014
  3. Merge branch 'scrapinghub/update_session_original_stacktrace'

    * scrapinghub/update_session_original_stacktrace:
      inets: Return correct stacktrace on session updating failure
    Marcus Arendt committed Oct 27, 2014
  4. Merge branch 'maint'

    Marcus Arendt committed Oct 27, 2014
  5. Merge branch 'vinoski/darwin-vsn-odbc' into maint

    * vinoski/darwin-vsn-odbc:
      Make ODBC configure handle OS X Mavericks and Yosemite
    Marcus Arendt committed Oct 27, 2014
Commits on Oct 24, 2014
  1. @sverker

    Merge branch 'sverk/hipe-inline-reserve-trap-frame'

    * sverk/hipe-inline-reserve-trap-frame:
      erts: Extend usage of ASM macro to avoid including asm macros in C code
      erts: Make hipe_{un}reserve_beam_trap_frame INLINE
    sverker committed Oct 24, 2014
  2. @sverker

    erts: Extend usage of ASM macro to avoid including asm macros in C code

    and reduce the probability of macro name collisions
    
    Catalyst: ppc macro "r0" conflicting with local variable in external.c
    sverker committed Oct 13, 2014
  3. @sverker
  4. @sverker

    Merge branch 'maint'

    sverker committed Oct 24, 2014
  5. @sverker

    Merge branch 'sverk/hipe-wrap-bif-disable-gc-fixes/OTP-12231' into maint

    * sverk/hipe-wrap-bif-disable-gc-fixes/OTP-12231:
      erts: Fix bug when hipe tailcalls trapping BIF that disables GC
      erts: Fix hipe bug when gc-disabling bif traps with gc enabled
    sverker committed Oct 24, 2014
  6. @sirihansen

    Merge branch 'siri/test-upgrade'

    * siri/test-upgrade:
      Add upgrade test in stdlib_SUITE
      [ct] Add ct_release_tests.erl
      Specify tar-file as basename in upgrade_SUITE
    sirihansen committed Oct 24, 2014
Commits on Oct 23, 2014
  1. @proxyles

    Merge branch 'maint'

    proxyles committed Oct 23, 2014
  2. @proxyles

    Merge branch 'maint-17' into maint

    Conflicts:
    	OTP_VERSION
    proxyles committed Oct 23, 2014
  3. Updated OTP version

    Erlang/OTP committed Oct 23, 2014
  4. Update release notes

    Erlang/OTP committed Oct 23, 2014
  5. Merge branch 'hans/ssh/scanning/OTP-12247' into maint-17

    * hans/ssh/scanning/OTP-12247:
      ssh: fix ssh.appup.src.
      ssh: Corrected appup
      ssh: fix .app and .appup errors
      ssh: remove supervisors for crashed connection worker
      ssh: Print supervisor tree (on demand).
      ssh: prepare for release
      ssh: avoid terminated but not deleted children to be counted.
      ssh: simple info function (ssh_info:print/0).
      ssh: Gracefully handle bad handshake messages
      ssh: reduce amount of printouts
      ssh: Fix port scanner problems
    Erlang/OTP committed Oct 23, 2014
  6. @rickard-green

    Merge branch 'maint'

    * maint:
    rickard-green committed Oct 23, 2014
  7. @rickard-green

    Merge branch 'rickard/default-eager-check-io/OTP-12254'

    * rickard/default-eager-check-io/OTP-12254:
      Change default to "eager check I/O"
    rickard-green committed Oct 23, 2014
  8. @rickard-green

    Merge branch 'rickard/master/eager-check-io/OTP-12117'

    * rickard/master/eager-check-io/OTP-12117:
      No eager check I/O on OSE
      Introduce support for eager check I/O scheduling
    rickard-green committed Oct 23, 2014
  9. @rickard-green

    Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into maint

    * rickard/maint-17/eager-check-io/OTP-12117:
      No eager check I/O on OSE
      Introduce support for eager check I/O scheduling
    rickard-green committed Oct 23, 2014
  10. @HansN

    ssh: fix ssh.appup.src.

    HansN committed Oct 23, 2014
  11. @IngelaAndin @HansN

    ssh: Corrected appup

    IngelaAndin committed with HansN Oct 15, 2014
  12. Merge branch 'maint'

    * maint:
      Fix rare race condition in Dets
    Hans Bolinder committed Oct 23, 2014
  13. Merge branch 'hb/stdlib/fix_dets_test' into maint

    * hb/stdlib/fix_dets_test:
      Fix rare race condition in Dets
    Hans Bolinder committed Oct 23, 2014
  14. Fix rare race condition in Dets

    The correction is due to the the evil testcase
    dets_SUITE:simultaneous_open(). If the process repairing a Dets file
    is killed (should normally never happen), and another process tries to
    repair the file, a temporary file from the first process could live on
    for a while, even after a successful call to file:delete(). This has
    only been seen on W-nd-ows, where it is a known problem.
    
    There are other ways to deal with the problem (rename the file; use
    some other filename), but we continue using one certain filename in
    order to be as backwards compatible as possible.
    Hans Bolinder committed Apr 10, 2014
  15. Merge branch 'maint'

    * maint:
      debugger: clean up Common Test adaption
    Hans Bolinder committed Oct 23, 2014
  16. Merge branch 'hb/debugger/ct_line_cleanup' into maint

    * hb/debugger/ct_line_cleanup:
      debugger: clean up Common Test adaption
    Hans Bolinder committed Oct 23, 2014
  17. Merge branch 'hb/dialyzer/compiler_option_asm_removed'

    * hb/dialyzer/compiler_option_asm_removed:
      dialyzer: remove recognition of the compiler option 'asm'
    Hans Bolinder committed Oct 23, 2014
Commits on Oct 22, 2014
  1. @HansN

    ssh: fix .app and .appup errors

    HansN committed Oct 22, 2014
  2. @HansN
  3. @HansN
  4. @brucify

    Merge branch 'maint'

    brucify committed Oct 22, 2014
  5. @brucify

    Merge branch 'vinoski/crashdump-sigusr1' into maint

    * vinoski/crashdump-sigusr1:
      Clarify the use of SIGUSR1 for forcing crash dumps
    brucify committed Oct 22, 2014
  6. @brucify

    Merge branch 'maint'

    brucify committed Oct 22, 2014
  7. @brucify

    Merge branch 'vinoski/clarify-drv-async-return' into maint

    * vinoski/clarify-drv-async-return:
      Clarify docs for driver_async() return value
    brucify committed Oct 22, 2014
Something went wrong with that request. Please try again.