Permalink
Commits on Aug 6, 2014
  1. Merge branch 'maint'

    * maint:
      os_mon: Fix so that all testcases are run
      os_mon: Ignore posix_only on windows and solaris
    garazdawi committed Aug 6, 2014
  2. Merge branch 'lukas/os_mon/testfixes/OTP-12053' into maint

    * lukas/os_mon/testfixes/OTP-12053:
      os_mon: Fix so that all testcases are run
      os_mon: Ignore posix_only on windows and solaris
    garazdawi committed Aug 6, 2014
  3. os_mon: Fix so that all testcases are run

    For some reason only a new testcases were run on the majority of
    platforms. After this change all tests are run on all unix and win32
    platforms.
    garazdawi committed Aug 6, 2014
  4. Merge branch 'maint'

    * maint:
      erts: Fix tc and docs after {fd,FD} bind change
    garazdawi committed Aug 6, 2014
  5. Merge branch 'lukas/erts/fd_bind_tc_fix/OTP-12061' into maint

    * lukas/erts/fd_bind_tc_fix/OTP-12061:
      erts: Fix tc and docs after {fd,FD} bind change
    garazdawi committed Aug 6, 2014
  6. erts: Fix tc and docs after {fd,FD} bind change

    The sha of the original change is 5281071
    garazdawi committed Aug 4, 2014
Commits on Aug 5, 2014
  1. Merge branch 'maint'

    brucify committed Aug 5, 2014
  2. Merge branch 'derek121/epmd-docs-2' into maint

    OTP-12052
    
    * derek121/epmd-docs-2:
      Fix minor grammatical errors in epmd docs
    brucify committed Aug 5, 2014
Commits on Jul 25, 2014
  1. Merge branch 'maint'

    proxyles committed Jul 25, 2014
  2. fix xml file merge messup

    proxyles committed Jul 25, 2014
Commits on Jul 24, 2014
  1. Merge branch 'maint'

    brucify committed Jul 24, 2014
  2. Merge branch 'garret-smith/gs-jinterface-exceptions' into maint

    OTP-12075
    
    * garret-smith/gs-jinterface-exceptions:
      Include the cause when raising a new IOException
    brucify committed Jul 24, 2014
  3. Merge branch 'maint'

    Conflicts:
    	erts/preloaded/ebin/prim_inet.beam
    proxyles committed Jul 24, 2014
  4. Merge branch 'maint-r16' into maint

    Conflicts:
    	erts/doc/src/notes.xml
    	erts/preloaded/ebin/prim_inet.beam
    	erts/vsn.mk
    	lib/kernel/doc/src/notes.xml
    	lib/kernel/vsn.mk
    proxyles committed Jul 24, 2014
Commits on Jul 23, 2014
  1. Merge branch 'maint'

    proxyles committed Jul 23, 2014
  2. Merge branch 'tuncer/system_principles-versions-typo' into maint

    * tuncer/system_principles-versions-typo:
      Fix a minor typo in system_principles/versions.xml
    proxyles committed Jul 23, 2014
Commits on Jul 22, 2014
  1. Update release notes

    Erlang/OTP committed Jul 22, 2014
  2. Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16

    * lukas/kernel/bind_with_fdopen/OTP-12061:
      Fix default behaviour for legacy fdopen
      erts: Fix inet close on prebound fds
      kernel: When doing an fdopen we now also bind the fd to the specified addr/port
    Erlang/OTP committed Jul 22, 2014
  3. Fix default behaviour for legacy fdopen

    Update testcase for gen_udp:open/2 with option fd
    proxyles committed Jul 22, 2014
  4. erts: Fix inet close on prebound fds

    Inet close must remove fd from select/poll without closing the fd.
    psyeugenic committed with proxyles May 26, 2014
Commits on Jul 21, 2014
  1. Fix minor grammatical errors in epmd docs

    Small grammar changes.
    derek121 committed Jul 21, 2014
Commits on Jul 17, 2014
Commits on Jul 16, 2014
Commits on Jul 15, 2014
  1. Merge branch 'maint'

    brucify committed Jul 15, 2014
  2. Merge branch 'nox/maps-shell-expansion' into maint

    OTP-12063
    
    * nox/maps-shell-expansion:
      Expand shell functions in map expressions
    brucify committed Jul 15, 2014
  3. Merge branch 'maint'

    psyeugenic committed Jul 15, 2014
  4. Merge branch 'egil/fix-xmerl-example' into maint

    * egil/fix-xmerl-example:
      xmerl: Fix xmerl example motorcycle2html
    psyeugenic committed Jul 15, 2014
  5. Merge branch 'maint'

    psyeugenic committed Jul 15, 2014
  6. Merge branch 'egil/maps-spec-to-doc-gen/OTP-12058' into maint

    * egil/maps-spec-to-doc-gen/OTP-12058:
      edoc: More Map tests
      edoc: Fix Map type information for docs
      erl_docgen: Add Map type information for docs
    psyeugenic committed Jul 15, 2014
  7. Merge branch 'maint'

    psyeugenic committed Jul 15, 2014
Commits on Jul 14, 2014
  1. tools: Use call instead of cast to stop lcnt server

    Mitigate gen_server:cast/2 race conditions in testcases.
    psyeugenic committed Jul 14, 2014