Permalink
Commits on Jun 6, 2012
  1. timeout for SSL close hang

    Minsu Choi committed Jun 6, 2012
Commits on Apr 17, 2012
  1. Merge branch 'egil/r16/inet-remove-bit8/OTP-10056'

    * egil/r16/inet-remove-bit8/OTP-10056:
      Update preloaded prim_inet.beam
      erts: Remove bit8 option from prim_inet
      kernel, erts: Remove bit8 option from inet
    psyeugenic committed Apr 17, 2012
Commits on Apr 16, 2012
  1. Merge branch 'maint'

    psyeugenic committed Apr 16, 2012
  2. Merge branch 'egil/inet-document-options/OTP-10053' into maint

    * egil/inet-document-options/OTP-10053:
      kernel: Document ifaddr option
      kernel: Document tcp-, udp- and sctp_module option
      kernel: Remove bit8 option in spec
      kernel: Document bit8 option in inet:setopts/2
      kernel: Initial doc of forgotten inet options
    psyeugenic committed Apr 16, 2012
  3. kernel: Document ifaddr option

      * same as ip option
    psyeugenic committed Apr 13, 2012
  4. kernel: Remove bit8 option in spec

      * The option is removed to force warnings for dialyzer
    psyeugenic committed Apr 13, 2012
Commits on Apr 13, 2012
  1. Merge branch 'maint'

    psyeugenic committed Apr 13, 2012
  2. Merge branch 'rr/wa-lcnt/OTP-10051' into maint

    * rr/wa-lcnt/OTP-10051:
      lcnt: Let runq locks reflect actual call location
      lcnt: Enhancement fixups
      erts: Add lcnt port and suspend options
      Increase ethr event and lock counting constants to allow at least +A 1024.
    psyeugenic committed Apr 13, 2012
  3. kernel: Document bit8 option in inet:setopts/2

      * This is a highly specialized option which is
        probably not used and will be removed in R16
    psyeugenic committed Apr 13, 2012
  4. Merge branch 'maint'

    Gustav Simonsson committed Apr 13, 2012
  5. Merge branch 'maint-r15' into maint

    Gustav Simonsson committed Apr 13, 2012
Commits on Apr 12, 2012
  1. Update .gitignore

    psyeugenic committed Apr 12, 2012
  2. eldap: Update .gitignore

    psyeugenic committed Apr 12, 2012
  3. kernel: Initial doc of forgotten inet options

      * UDP: ulticast_if, multicast_loop and multicast_ttl,
        add_membership and drop_membership
    
      * Inet: bit8, buffer, deliver, high_watermark, linger and
        low_watermark
    psyeugenic committed Apr 12, 2012
Commits on Apr 11, 2012
  1. Merge branch 'maint-r14' into maint-r15

    Gustav Simonsson committed Apr 11, 2012
  2. Merge branch 'maint'

    sverker committed Apr 11, 2012
  3. Merge branch 'sverk/otp_build-no-commit-opt' into maint

    * sverk/otp_build-no-commit-opt:
      Add --no-commit option to update_primary and update_preloaded
    sverker committed Apr 11, 2012
Commits on Apr 10, 2012
  1. lcnt: Enhancement fixups

    psyeugenic committed Apr 10, 2012
Commits on Apr 5, 2012
  1. erts: Add lcnt port and suspend options

    * Add new suspend, location, and port_locks options to erts_debug:lock_counters.
    * Init and destroy lock counting for processes and ports as appropriate.
    
    Conflicts:
    
    	erts/emulator/beam/erl_bif_info.c
    reedr committed with psyeugenic Mar 16, 2012
Commits on Apr 4, 2012
Commits on Apr 3, 2012
  1. Merge branch 'maint'

    psyeugenic committed Apr 3, 2012
  2. Merge commit 'OTP_R15B01'

    psyeugenic committed Apr 3, 2012
Commits on Apr 1, 2012
  1. Prepare release

    Erlang/OTP committed Apr 1, 2012
Commits on Mar 30, 2012
  1. Merge branch 'peppe/common_test/otp-10039' into maint

    * peppe/common_test/otp-10039:
      Document the new timetrap interface
    pekadan committed Mar 30, 2012
  2. Document the new timetrap interface

    OTP-10039
    pekadan committed Mar 30, 2012
  3. Merge branch 'maint'

    sverker committed Mar 30, 2012