Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: erlang/otp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: OTP-26.2
Choose a base ref
...
head repository: erlang/otp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: OTP-26.2.1
Choose a head ref
  • 14 commits
  • 19 files changed
  • 4 contributors

Commits on Dec 14, 2023

  1. Fix so that tag + branch with same sha do not cancel eachother 

    This happens when a new tag is pushed and the base branch is also
pushed. So by including the github.ref (aka branch/tag name) we put tags
and branches in different concurrency groups.
    @garazdawi
    garazdawi committed Dec 14, 2023
    Copy the full SHA
    e364e99 View commit details

Commits on Dec 15, 2023

  1. ssh: KEX strict 

    - negotiate "strict KEX" OpenSSH feature
- when negotiated between peers apply strict KEX
- related tests
- print_seqnums fix in ssh_trtp test code
    @u3s
    u3s committed Dec 15, 2023
    Copy the full SHA
    ee67d46 View commit details

  2. [erts] Remove unused pcre tar-ball

    @rickard-green
    rickard-green committed Dec 15, 2023
    Copy the full SHA
    ee6ba41 View commit details

  3. Fixes of license and copyright information

    @rickard-green
    rickard-green committed Dec 15, 2023
    Copy the full SHA
    8979e31 View commit details

  4. Merge branch 'rickard/license-fix/24/OTP-18896' into rickard/license-… 

    …fix/25/OTP-18896

* rickard/license-fix/24/OTP-18896:
  Fixes of license and copyright information
    @rickard-green
    rickard-green committed Dec 15, 2023
    Copy the full SHA
    ecc94c0 View commit details

  5. Update license information for OTP 25

    @rickard-green
    rickard-green committed Dec 15, 2023
    Copy the full SHA
    ecdc212 View commit details

  6. Merge branch 'rickard/license-fix/25/OTP-18896' into rickard/license-… 

    …fix/26/OTP-18903

* rickard/license-fix/25/OTP-18896:
  Update license information for OTP 25
  Fixes of license and copyright information
    @rickard-green
    rickard-green committed Dec 15, 2023
    Copy the full SHA
    a10a92b View commit details

  7. Merge branch 'lukas/gh/maint-26' into maint-26 

    * lukas/gh/maint-26:
  Fix so that tag + branch with same sha do not cancel eachother
    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    2335151 View commit details

  8. Merge branch 'kuba/maint-24/ssh/kex_strict/OTP-18897' into maint-26 

    * kuba/maint-24/ssh/kex_strict/OTP-18897:
  ssh: KEX strict

# Conflicts:
#	lib/ssh/test/ssh_to_openssh_SUITE.erl
    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    d2dd225 View commit details

  9. Merge branch 'rickard/rm-pcre-tar/OTP-18902' into maint-26 

    * rickard/rm-pcre-tar/OTP-18902:
  [erts] Remove unused pcre tar-ball
    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    f690b35 View commit details

  10. Merge branch 'rickard/license-fix/26/OTP-18903' into maint-26 

    * rickard/license-fix/26/OTP-18903:
  Update license information for OTP 25
  Fixes of license and copyright information
    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    4270fcb View commit details

  11. Update copyright year

    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    9bc3c70 View commit details

  12. Prepare release

    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    aefa1cb View commit details

  13. Updated OTP version

    Erlang/OTP committed Dec 15, 2023
    Copy the full SHA
    ca8b893 View commit details
Loading