Permalink
Switch branches/tags
Commits on Aug 25, 2017
  1. Merge branch 'maint-20' into maint

    proxyles committed Aug 25, 2017
    * maint-20:
      Updated OTP version
      Prepare release
      dialyzer: Fix a bug where merging PLT:s could lose info
  2. Merge pull request #1538 from bjorng/bjorn/os_mon/high-sierra/ERL-461

    bjorng committed Aug 25, 2017
    Fix disksup:get_disksup_data() for High Sierra
    
    OTP-14560
  3. Updated OTP version

    Erlang/OTP
    Erlang/OTP committed Aug 25, 2017
  4. Prepare release

    Erlang/OTP
    Erlang/OTP committed Aug 25, 2017
  5. Merge branch 'rickard/btm-auto-cleanup-bug/OTP-14554' into maint-20

    Erlang/OTP
    Erlang/OTP committed Aug 25, 2017
    * rickard/btm-auto-cleanup-bug/OTP-14554:
      Fix BIF timer race between timeout and auto cleanup
  6. Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint-20

    Erlang/OTP
    Erlang/OTP committed Aug 25, 2017
    * rickard/timer-sid-bug/OTP-14548:
      Fix scheduler id field in timers
    
    # Conflicts:
    #	erts/emulator/beam/erl_hl_timer.c
  7. Merge branch 'hasse/dialyzer/fix_merge_plts/ERIERL-53/OTP-14558' into…

    Erlang/OTP
    Erlang/OTP committed Aug 25, 2017
    … maint-20
    
    * hasse/dialyzer/fix_merge_plts/ERIERL-53/OTP-14558:
      dialyzer: Fix a bug where merging PLT:s could lose info
Commits on Aug 24, 2017
  1. Merge branch 'johanclaesson/fprof/PR-1460/OTP-14500' into maint

    garazdawi committed Aug 24, 2017
    * johanclaesson/fprof/PR-1460/OTP-14500:
      fprof: Sum callers and callees
  2. fprof: Sum callers and callees

    Johan Claesson authored and garazdawi committed May 15, 2017
    When sampling multiple processes and analyzing with totals true sum
    together all caller and callee entries which concerns the same
    function.  Previous behaviour was to report each contributing entry.
  3. Merge branch 'rickard/btm-auto-cleanup-bug/OTP-14554' into maint

    rickard-green committed Aug 24, 2017
    * rickard/btm-auto-cleanup-bug/OTP-14554:
      Fix BIF timer race between timeout and auto cleanup
  4. Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint

    rickard-green committed Aug 24, 2017
    * rickard/timer-sid-bug/OTP-14548:
      Fix scheduler id field in timers
    
    Conflicts:
    	erts/emulator/beam/erl_hl_timer.c
  5. Merge pull request #1539 from johanclaesson/xrefref

    dgud committed Aug 24, 2017
    Emacs: Fix default target for xref-find-references
  6. Merge branch 'ingela/ssl/dtls-alert-handling/OTP-14078' into maint

    IngelaAndin committed Aug 24, 2017
    * ingela/ssl/dtls-alert-handling/OTP-14078:
      dtls: Customize alert handling for DTLS over UDP
  7. dialyzer: Fix a bug where merging PLT:s could lose info

    uabboli committed Aug 24, 2017
    A missing call to ets:safe_fixtable/2 meant that information
    was sometimes lost when merging PLT:s.
  8. Merge branch 'ingela/ssl/tls-vs-dtls-version' into maint

    IngelaAndin committed Aug 24, 2017
    * ingela/ssl/tls-vs-dtls-version:
      ssl: DTLS packet support
      ssl: Enable dtls tests
      ssl: Adjust ALPN and next protocol to work with DTLS
      ssl: Enable more DTLS tests
      ssl: negotiated_hashsign/4 expects TLS version to function correctly
  9. ssl: DTLS packet support

    IngelaAndin committed Aug 23, 2017
    Test that DTLS handles "high" level packet types as http-packet types.
    Low level packet type as {packet, 2} we will consider later if they
    should be relevant to support or not.
  10. Merge branch 'maint-20' into maint

    RaimoNiskanen committed Aug 24, 2017
    * maint-20:
      Updated OTP version
      Prepare release
      Accept non-binary options as socket-options
      Bump version
      Fix broken handling of default values in extensions for PER
      compiler: Fix live regs update on allocate in validator
      Take fail labels into account when determining liveness in block ops
      Check for overflow when appending binaries, and error out with system_limit
Commits on Aug 23, 2017
  1. Emacs: Fix default target for xref-find-references

    johanclaesson committed Aug 22, 2017
    The default target is changed to be just the name at point when
    xref-find-references is invoked.  Previously the default was the same
    as for xref-find-definitions.  This included arity and other things
    that do not make sense for xref-find-references.
  2. Merge branch 'rickard/unicode-display_string/OTP-14545' into maint

    rickard-green committed Aug 23, 2017
    * rickard/unicode-display_string/OTP-14545:
      Unicode support for erlang:display_string/1
  3. Merge branch 'sverker/halt-unicode-slogan/OTP-14553' into maint

    sverker committed Aug 23, 2017
    * sverker/halt-unicode-slogan/OTP-14553:
      erts: Allow any unicode string as crash dump slogan
      erts: Generate crash_dump slogan string as UTF8
      erts: Refactor erts_unicode_list_to_buf
  4. erts: Allow any unicode string as crash dump slogan

    sverker committed Aug 23, 2017
    i.e the first argument to erlang:halt
  5. ssl: Enable dtls tests

    IngelaAndin committed Aug 23, 2017
    Also run this suit on all TLS versions
  6. Merge pull request #1533 from hamidreza-s/fix-sftp-file-access

    HansN committed Aug 23, 2017
    Fix file owner access permission in ssh_sftp module
    OTP-14550
  7. Updated OTP version

    Erlang/OTP
    Erlang/OTP committed Aug 23, 2017
  8. Prepare release

    Erlang/OTP
    Erlang/OTP committed Aug 23, 2017
  9. Merge branch 'hans/ssh/non_binary_socket_options/ERIERL-63/OTP-14541'…

    Erlang/OTP
    Erlang/OTP committed Aug 23, 2017
    … into maint-20
    
    * hans/ssh/non_binary_socket_options/ERIERL-63/OTP-14541:
      Accept non-binary options as socket-options
  10. Merge branch 'bjorn/asn1/broken-default-in-ext/ERIERL-60/OTP-13011' i…

    Erlang/OTP
    Erlang/OTP committed Aug 23, 2017
    …nto maint-20
    
    * bjorn/asn1/broken-default-in-ext/ERIERL-60/OTP-13011:
      Bump version
      Fix broken handling of default values in extensions for PER
  11. Merge branch 'john/erts/fix-binary-append-syslimit/OTP-14524' into ma…

    Erlang/OTP
    Erlang/OTP committed Aug 23, 2017
    …int-20
    
    * john/erts/fix-binary-append-syslimit/OTP-14524:
      Check for overflow when appending binaries, and error out with system_limit
    
    # Conflicts:
    #	erts/emulator/test/bs_construct_SUITE.erl
  12. Merge branch 'john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OT…

    Erlang/OTP
    Erlang/OTP committed Aug 23, 2017
    …P-14522' into maint-20
    
    * john/compiler/fail-labels-in-blocks-otp-19/ERIERL-48/OTP-14522:
      compiler: Fix live regs update on allocate in validator
      Take fail labels into account when determining liveness in block ops
  13. ssl: Enable more DTLS tests

    IngelaAndin committed Aug 14, 2017
    Problems with failure of ssl_certificate_verify_SUITE when enabling DTLS-1
    tests in ssl_basic_SUITE was a combination of the bug fixed by the
    previous commit and missing clean up code for dtls_protocol_versions
    application environment variable
  14. ssl: negotiated_hashsign/4 expects TLS version to function correctly

    IngelaAndin committed Aug 14, 2017
    Only DTLS specific code deals with DTLS version, when common code
    is used the DTLS version should be converted to the corresponding TLS version.