Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from erlang:master #192

Merged
merged 164 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
d1e95c5
Fix gen_tcp:send/2 docs
juhlig Dec 4, 2024
a56538b
[erts|esock] Improve debugging during (unix) socket open
bmk Dec 6, 2024
166d300
[kernel|esock|udp] Tweaked open to properly handle the debug option
bmk Dec 6, 2024
014b51d
[kernel|esock|udp|test] Tweaked some tc to handle Darwin
bmk Dec 6, 2024
8019266
[kernel|esock|tcp] Tweaked open to properly handle the debug option
bmk Dec 6, 2024
018fe58
[kernel|esock|tcp|test] Tweaked some tc to handle Darwin
bmk Dec 6, 2024
f024574
kernel: Fix race with prim_tty loading during starup
garazdawi Dec 20, 2024
13d47f4
Update primary bootstrap
garazdawi Dec 20, 2024
e4c5525
Document details of existing integer and float notation
richcarl Dec 21, 2024
0f7cb5a
erts: Fix init termination bug
garazdawi Dec 17, 2024
0afd8d0
Make scanner accept based floating point literals
richcarl Nov 10, 2024
f562828
set proper triplets for all Windows
cocoa-xu Oct 27, 2024
674d732
syntax_tools: Update dependencies
bjorng Jan 10, 2025
05bced8
ssl: Avoid unnecessary duplicates
IngelaAndin Jan 13, 2025
558efc6
build(deps): bump the github-actions group with 3 updates
dependabot[bot] Jan 13, 2025
b745af4
build(deps): bump the github-actions group with 2 updates
dependabot[bot] Jan 13, 2025
1c83b27
build(deps): bump the github-actions group with 2 updates
dependabot[bot] Jan 13, 2025
ce0727d
build(deps): bump the github-actions group with 3 updates
dependabot[bot] Jan 13, 2025
b3df833
Eliminate use of old catch in eunit
richcarl Dec 7, 2024
c9b3460
Deprecate old catches in syntax_tools
richcarl Dec 8, 2024
3e204d9
Deprecate old catches in edoc
richcarl Dec 8, 2024
da10132
Fix timer:sleep/1 spec
Maria-12648430 Jan 15, 2025
b91669a
ssh: remove adjust_window call from ssh_connection
u3s Jan 16, 2025
08d43d6
ssh: remove adjust_window call from ssh_connection
u3s Jan 16, 2025
bbfd02f
Fix calendar rfc3339 fractional seconds
Maria-12648430 Jan 19, 2025
0a54879
Fix formatting in system principles documentation table
hichemfantar Jan 19, 2025
e1bd3f9
Merge branch 'bmk/kernel/20241205/gen_x_socket_open_dbg_improvement/O…
bmk Jan 20, 2025
d1e4878
dialyzer: Fix opaque-related crash
jhogberg Jan 20, 2025
7e3d315
Fix incompatible-pointer-type error in nif_SUITE.c
jcpetruzza Jan 19, 2025
659d1e4
Merge branch 'fix_incompatible_pointer_type_nif_suite' into maint
sverker Jan 20, 2025
887f7a6
Merge branch 'maint'
sverker Jan 20, 2025
ca247f6
Merge branch 'dependabot/github_actions/master/github-actions-062d0f9…
garazdawi Jan 20, 2025
495819e
Merge branch 'dependabot/github_actions/maint-25/github-actions-69acc…
garazdawi Jan 20, 2025
3e14e7c
Merge branch 'maint'
garazdawi Jan 20, 2025
7931f75
Merge branch 'maint-25' into maint
garazdawi Jan 20, 2025
2568cb9
Merge branch 'dependabot/github_actions/maint-26/github-actions-69acc…
garazdawi Jan 20, 2025
9b4bcda
Merge branch 'maint'
garazdawi Jan 20, 2025
fcc3d9f
Merge branch 'maint-26' into maint
garazdawi Jan 20, 2025
01e2931
Merge branch 'maint'
garazdawi Jan 20, 2025
0357602
Merge branch 'maint-27' into maint
garazdawi Jan 20, 2025
a47de22
Merge branch 'dependabot/github_actions/maint-27/github-actions-062d0…
garazdawi Jan 20, 2025
c582aba
Merge pull request #9280 from Maria-12648430/fix_calendar_fractional_…
bjorng Jan 20, 2025
2190324
Merge branch 'maria/stdlib/fix-timer/PR-9303/OTP-19442' into maint
kikofernandez Jan 20, 2025
a6a25e3
Merge branch 'maint'
kikofernandez Jan 20, 2025
becc26e
Merge branch 'bjorn/syntax_tools/update-dependencies'
bjorng Jan 20, 2025
a14c946
erts: Fix assert in erts_add_taint for static NIFs
lexprfuncall Jan 16, 2025
3503e50
kernel: fixes socket.erl type spec
kikofernandez Jan 14, 2025
6313ee2
erts: Fix reply to invalid requests in group
garazdawi Jan 20, 2025
a95386f
Fix table formatting in reference manuals and guides
hichemfantar Jan 20, 2025
c3679fc
Fix formatting in system principles documentation table
hichemfantar Jan 20, 2025
9b159d1
Merge 'fix-static-nif-init-assertion-failure' into maint
sverker Jan 20, 2025
52b82ed
Merge branch 'maint'
sverker Jan 20, 2025
1482f51
build(deps): bump the github-actions group with 3 updates
dependabot[bot] Jan 21, 2025
a4098f6
ssl: Use include_lib in tests for whitebox testing
dgud Oct 31, 2024
bc5ff24
ssl: Refactoring sender
dgud Nov 13, 2024
5c7b8dd
ssl: Split calls to crypto:crypto_one_time_aead
dgud Nov 14, 2024
3961fc0
ssl: Shortcut data path
dgud Nov 26, 2024
0bc29c5
ssl: Fix alert record bug
dgud Nov 21, 2024
725e0e2
Merge branch 'kuba/ssh/sftp_large_transfer_fix/OTP-19435' into maint
u3s Jan 21, 2025
b6f55e7
Merge branch 'maint'
u3s Jan 21, 2025
5405ffc
Merge pull request #8994 from cocoa-xu/cx-windows-system-architecture
jhogberg Jan 21, 2025
2e5473f
Merge branch 'kiko/kernel/fix-socket-typespec/OTP-19429' into maint
kikofernandez Jan 21, 2025
bcaa4ae
Merge branch 'maint'
kikofernandez Jan 21, 2025
9111fcd
Merge pull request #9312 from hichemfantar/better-table-headers
garazdawi Jan 21, 2025
33ee122
gh: Enable legacy_tiocsti for shell testing
garazdawi Jan 21, 2025
d9cd7e1
Merge pull request #9230 from garazdawi/lukas/kernel/fix-tty-start-race
garazdawi Jan 21, 2025
bec34b7
gh: Remove erts-*/erl.ini before creating otp*.zip
wojtekmach Jan 21, 2025
0fb1dbc
Merge branch 'pr/9145' into maint
IngelaAndin Jan 21, 2025
6f76fc7
Merge branch 'maint'
IngelaAndin Jan 21, 2025
b35f817
Merge branch 'john/dialyzer/fix-opaque-crash/ERIERL-1183/OTP-19439' i…
jhogberg Jan 22, 2025
0d6d391
Merge branch 'maint'
jhogberg Jan 22, 2025
c6175d5
Merge branch 'dgud/ssl/bad-aleart/OTP-19433' into maint
dgud Jan 22, 2025
cb4df62
Merge branch 'maint'
dgud Jan 22, 2025
81c5c42
ssl: Postpone verifying of server options when {handshake, hello} is …
IngelaAndin Jan 21, 2025
31eee62
ssl: Fix specs
IngelaAndin Jan 21, 2025
6bc0cc8
Merge branch 'dgud/ssl/optimize-tlsv1.3/OTP-19430'
dgud Jan 22, 2025
0cdfdb0
Merge pull request #9326 from wojtekmach/wm-erlini
garazdawi Jan 22, 2025
1d0da94
Merge branch 'ingela/ssl/avoid/duplicate-sign-algos/OTP-19428' into m…
IngelaAndin Jan 22, 2025
ff42228
Merge branch 'maint'
IngelaAndin Jan 22, 2025
ea0927e
Merge branch 'lukas/stdlib/fix-group-invalid-request/OTP-19444' into …
garazdawi Jan 22, 2025
9bacc94
Merge branch 'lukas/erts/fix-init-termination-bug/OTP-19418' into maint
garazdawi Jan 22, 2025
a0fbd66
Merge branch 'lukas/gh/maint-26' into maint
garazdawi Jan 22, 2025
7d4486d
Merge branch 'maint'
garazdawi Jan 22, 2025
22aad94
stdlib: Add warning for inlined nifs without loading
lucioleKi Jan 21, 2025
8d0276e
dialyzer: Add missing license headers
jhogberg Jan 22, 2025
ab9590f
Merge branch 'john/dialyzer/fix-license-headers' into maint
jhogberg Jan 22, 2025
555fb99
Merge branch 'maint'
jhogberg Jan 22, 2025
824f994
ssl: Handle user initiated cancelation during handshake
IngelaAndin Jan 8, 2025
59c4283
Merge branch 'ingela/ssl/alert-handling-in-hs-when-user-action-causes…
IngelaAndin Jan 22, 2025
5677cc4
Merge branch 'maint'
IngelaAndin Jan 22, 2025
de32899
Fix specs in read_file function
Mikaka27 Jan 22, 2025
7a982ae
kernel: Fix invalid group request
garazdawi Jan 22, 2025
8141530
kernel: unicode character cannot be part of escape sequences
frazze-jobb Jan 8, 2025
85ab462
Merge branch 'michal/tftp/fix_specs_in_read_file_function/ERIERL-1179…
Mikaka27 Jan 22, 2025
d1b64e9
Merge branch 'maint'
Mikaka27 Jan 22, 2025
06ec689
Merge branch 'kuba/ssl/ssl_trace_SUITE_update' into maint-27
Jan 22, 2025
5a8b6d5
Merge branch 'kuba/ssh/fix_connection_info_spec/ERIERL-1165/OTP-19388…
Jan 22, 2025
2e6779d
Merge branch 'alexandrejbr/ssh-accept-userauth-banner/OTP-19392' into…
Jan 22, 2025
6673244
Merge branch 'michal/maint-27/common_test/fix_compatiblity_between_ot…
Jan 22, 2025
e4bd1a6
Merge branch 'john/merge-9211/OTP-19407/GH-9211/PR-9234' into maint-27
Jan 22, 2025
8c672b4
Merge branch 'kuba/ssh/sftp_large_transfer_fix/OTP-19435' into maint-27
Jan 22, 2025
ac774db
Merge branch 'john/dialyzer/fix-opaque-crash/ERIERL-1183/OTP-19439' i…
Jan 22, 2025
d32d13f
Merge branch 'lukas/erts/fix-init-termination-bug/OTP-19418' into mai…
Jan 22, 2025
998f4a9
Merge branch 'lukas/stdlib/fix-group-invalid-request/OTP-19444' into …
Jan 22, 2025
3cd598d
Merge branch 'michal/tftp/fix_specs_in_read_file_function/ERIERL-1179…
Jan 22, 2025
16918d1
Update copyright year
Jan 22, 2025
1d963ba
Prepare release
Jan 22, 2025
4726e39
Updated OTP version
Jan 22, 2025
1295ec4
Merge branch 'ingela/ssl/paused-hs/GH-9177/OTP-19445' into maint
IngelaAndin Jan 22, 2025
350b1d6
Merge branch 'maint'
IngelaAndin Jan 22, 2025
d3f46f1
Merge branch 'ingela/ssl/paused-hs/GH-9177/OTP-19445' into maint
IngelaAndin Jan 22, 2025
b18037b
Merge branch 'maint'
IngelaAndin Jan 23, 2025
d15be5e
Merge branch 'maint'
garazdawi Jan 23, 2025
a51de9c
Merge branch 'dependabot/github_actions/maint/github-actions-062d0f90…
garazdawi Jan 23, 2025
1b95331
Merge pull request #9301 from richcarl/deprecate-old-catch-rc
bjorng Jan 23, 2025
2be4834
ssl: Ensure that we get intended error handling
IngelaAndin Jan 23, 2025
a8454d7
ssl: Correct handshake hello handling
IngelaAndin Jan 21, 2025
444b3e6
ssl: Handle user initiated cancelation during handshake
IngelaAndin Jan 8, 2025
44b92da
Merge branch 'maint-27' into maint
Jan 23, 2025
d2264ff
Merge branch 'maint' into master
Jan 23, 2025
2859732
Merge pull request #9340 from IngelaAndin/ingela/ssl/error-handling-f…
IngelaAndin Jan 24, 2025
9465843
ssl: Termination needs to be best effort, can fail for DTLS
IngelaAndin Jan 23, 2025
7b0f1d8
Merge branch 'ingela/ssl/maint-26/OTP-19411' into maint
IngelaAndin Jan 24, 2025
ae48c14
Merge branch 'ingela/ssl/maint-26/OTP-19445' into maint
IngelaAndin Jan 24, 2025
f672aed
Merge branch 'maint'
IngelaAndin Jan 24, 2025
c95cfa1
Document based floats
richcarl Jan 24, 2025
39e9bf1
Fix .github/workflows/upload-windows-zip.yaml
wojtekmach Jan 24, 2025
b14a795
Merge pull request #9343 from wojtekmach/wm-fix-upload-windows-zip
garazdawi Jan 24, 2025
a7d486b
Merge branch 'kuba/maint-26/ssh/sftp_large_transfer_fix/OTP-19435' in…
u3s Jan 24, 2025
debbc7b
Merge branch 'maint'
u3s Jan 24, 2025
1441260
ssl: Termination needs to be best effort, can fail for DTLS
IngelaAndin Jan 23, 2025
0d213da
Merge branch 'kuba/ssl/ssl_trace_SUITE_update' into maint-26
Jan 26, 2025
6c9dd94
Merge branch 'kuba/maint-25/ssh/fix_connection_info_spec/ERIERL-1165/…
Jan 26, 2025
6d82bb8
Merge branch 'alexandrejbr/ssh-accept-userauth-banner/OTP-19392' into…
Jan 26, 2025
5fe40a0
Merge branch 'michal/common_test/fix_compatiblity_between_otp27_and_e…
Jan 26, 2025
bf4eb90
Merge branch 'john/merge-9211/OTP-19407/GH-9211/PR-9234' into maint-26
Jan 26, 2025
3ab62c7
Merge branch 'kuba/maint-26/ssh/sftp_large_transfer_fix/OTP-19435' in…
Jan 26, 2025
af2c808
Merge branch 'john/dialyzer/fix-opaque-crash/ERIERL-1183/OTP-19439' i…
Jan 26, 2025
aff51c0
Merge branch 'ingela/ssl/maint-26/OTP-19445' into maint-26
Jan 26, 2025
38d6ab2
Merge branch 'ingela/ssl/maint-26/OTP-19411' into maint-26
Jan 26, 2025
c4b0ae9
Merge branch 'lukas/erts/fix-init-termination-bug/OTP-19418' into mai…
Jan 26, 2025
3607d75
Update copyright year
Jan 26, 2025
1317faa
Prepare release
Jan 26, 2025
3b059b6
Updated OTP version
Jan 26, 2025
921aa49
Updated ex_doc version to v0.37.0-rc.0
garazdawi Jan 26, 2025
cc0c9e4
Fix mermaid after ex_doc upgrade and bumb its version
garazdawi Jan 26, 2025
e6ced7f
Merge branch 'ingela/ssl/termination/OTP-19411' into maint
IngelaAndin Jan 27, 2025
8388209
Merge branch 'maint'
IngelaAndin Jan 27, 2025
7ea07aa
docs: Remove monospace font special-case
garazdawi Jan 27, 2025
d72f66f
Merge pull request #9323 from lucioleKi/isabell/inline-nifs
lucioleKi Jan 27, 2025
65a9caa
Merge pull request #9346 from garazdawi/lukas/doc/update_ex_doc
garazdawi Jan 27, 2025
96ea890
Merge pull request #9106 from richcarl/hexbinfloat
bjorng Jan 27, 2025
fc44a86
Merge branch 'maint-26' into maint
Jan 27, 2025
e78831e
Merge branch 'maint' into master
Jan 27, 2025
0ff9d32
Merge pull request #9272 from frazze-jobb/frazze/kernel/prim_tty_unic…
frazze-jobb Jan 27, 2025
93dff51
build(deps): bump github/codeql-action in the github-actions group
dependabot[bot] Jan 27, 2025
16166ea
build(deps): bump github/codeql-action in the github-actions group
dependabot[bot] Jan 27, 2025
71fa992
build(deps): bump github/codeql-action in the github-actions group
dependabot[bot] Jan 28, 2025
31f5e35
Merge branch 'dependabot/github_actions/maint/github-actions-317d9544…
garazdawi Jan 28, 2025
30deb3a
Merge branch 'maint'
garazdawi Jan 28, 2025
fd1f81f
Merge branch 'dependabot/github_actions/maint-27/github-actions-317d9…
garazdawi Jan 28, 2025
6e49933
Merge branch 'maint-27' into maint
garazdawi Jan 28, 2025
7cdfb5b
Merge branch 'maint'
garazdawi Jan 28, 2025
77ad730
Merge branch 'dependabot/github_actions/master/github-actions-317d954…
garazdawi Jan 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion erts/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-Autoconf-*

dnl %CopyrightBegin%
dnl
dnl Copyright Ericsson AB 1997-2024. All Rights Reserved.
dnl Copyright Ericsson AB 1997-2025. All Rights Reserved.
dnl
dnl Licensed under the Apache License, Version 2.0 (the "License");
dnl you may not use this file except in compliance with the License.
Expand Down
19 changes: 19 additions & 0 deletions erts/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,25 @@ limitations under the License.

This document describes the changes made to the ERTS application.

## Erts 15.2.1

### Fixed Bugs and Malfunctions

- Fixed configure tests for GCC 14

Own Id: OTP-19407 Aux Id: [GH-9211], [PR-9234]

- Fix bug where log printouts would go missing when `application_controller` is stopping while log messages are being sent.

This bug was introduced by OTP-19078 in Erlang/OTP 26.2.5.

Own Id: OTP-19418 Aux Id: [GH-9163], [PR-9274]

[GH-9211]: https://github.com/erlang/otp/issues/9211
[PR-9234]: https://github.com/erlang/otp/pull/9234
[GH-9163]: https://github.com/erlang/otp/issues/9163
[PR-9274]: https://github.com/erlang/otp/pull/9274

## Erts 15.2

### Fixed Bugs and Malfunctions
Expand Down
2 changes: 1 addition & 1 deletion erts/preloaded/src/init.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 1996-2024. All Rights Reserved.
%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion erts/vsn.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# %CopyrightEnd%
#

VSN = 15.2
VSN = 15.2.1

# Port number 4365 in 4.2
# Port number 4366 in 4.3
Expand Down
11 changes: 11 additions & 0 deletions lib/common_test/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ limitations under the License.
-->
# Common Test Release Notes

## Common_Test 1.27.6

### Fixed Bugs and Malfunctions

- Common test will now not crash when running tests with otp26 and earlier, while having previous test resuts from otp27.

Own Id: OTP-19385 Aux Id: ERIERL-1166, [PR-9155], [PR-9156]

[PR-9155]: https://github.com/erlang/otp/pull/9155
[PR-9156]: https://github.com/erlang/otp/pull/9156

## Common_Test 1.27.5

### Fixed Bugs and Malfunctions
Expand Down
2 changes: 1 addition & 1 deletion lib/common_test/vsn.mk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
COMMON_TEST_VSN = 1.27.5
COMMON_TEST_VSN = 1.27.6
10 changes: 10 additions & 0 deletions lib/dialyzer/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ limitations under the License.

This document describes the changes made to the Dialyzer application.

## Dialyzer 5.3.1

### Fixed Bugs and Malfunctions

- Fixed a crash caused by the use of opaque types.

Own Id: OTP-19439 Aux Id: ERIERL-1183, [PR-9314]

[PR-9314]: https://github.com/erlang/otp/pull/9314

## Dialyzer 5.3

### Fixed Bugs and Malfunctions
Expand Down
2 changes: 1 addition & 1 deletion lib/dialyzer/vsn.mk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIALYZER_VSN = 5.3
DIALYZER_VSN = 5.3.1
13 changes: 13 additions & 0 deletions lib/kernel/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ limitations under the License.

This document describes the changes made to the Kernel application.

## Kernel 10.2.1

### Fixed Bugs and Malfunctions

- Fix the default group_leader to reply `{error,request}` on invalid I/O requests instead of crashing.

This bug was introduced in Erlang/OTP 27.2.

Own Id: OTP-19444 Aux Id: [GH-9237], [PR-9318]

[GH-9237]: https://github.com/erlang/otp/issues/9237
[PR-9318]: https://github.com/erlang/otp/pull/9318

## Kernel 10.2

### Fixed Bugs and Malfunctions
Expand Down
2 changes: 1 addition & 1 deletion lib/kernel/src/application_controller.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 1996-2024. All Rights Reserved.
%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion lib/kernel/src/group.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 1996-2024. All Rights Reserved.
%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
4 changes: 4 additions & 0 deletions lib/kernel/src/kernel.appup.src
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
{<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^10\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^10\\.2$">>,[restart_new_emulator]},
{<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.4$">>,[restart_new_emulator]},
{<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
Expand Down Expand Up @@ -64,6 +66,8 @@
{<<"^10\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^10\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^10\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^10\\.2$">>,[restart_new_emulator]},
{<<"^10\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.4$">>,[restart_new_emulator]},
{<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
Expand Down
2 changes: 1 addition & 1 deletion lib/kernel/vsn.mk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
KERNEL_VSN = 10.2
KERNEL_VSN = 10.2.1
21 changes: 21 additions & 0 deletions lib/ssh/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@ limitations under the License.
-->
# SSH Release Notes

## Ssh 5.2.6

### Fixed Bugs and Malfunctions

- With this change, type specs for ssh:connection_info/1,2 functions are fixed so they include \{error, term()\} return value.

Own Id: OTP-19388 Aux Id: ERIERL-1165, [PR-9161]

- With this change, ssh client accepts a banner sent during processing keyboard interactive user authentication.

Own Id: OTP-19392 Aux Id: [PR-9139], [GH-9065]

- With this change, large sftp transfers does not hang. Redundant window adjustment are not requested.

Own Id: OTP-19435 Aux Id: [PR-9309]

[PR-9161]: https://github.com/erlang/otp/pull/9161
[PR-9139]: https://github.com/erlang/otp/pull/9139
[GH-9065]: https://github.com/erlang/otp/issues/9065
[PR-9309]: https://github.com/erlang/otp/pull/9309

## Ssh 5.2.5

### Fixed Bugs and Malfunctions
Expand Down
2 changes: 1 addition & 1 deletion lib/ssh/src/ssh_connection.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2008-2024. All Rights Reserved.
%% Copyright Ericsson AB 2008-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion lib/ssh/test/ssh_connection_SUITE.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2008-2024. All Rights Reserved.
%% Copyright Ericsson AB 2008-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion lib/ssh/test/ssh_sftp_SUITE.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2005-2024. All Rights Reserved.
%% Copyright Ericsson AB 2005-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion lib/ssh/vsn.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode

SSH_VSN = 5.2.5
SSH_VSN = 5.2.6
APP_VSN = "ssh-$(SSH_VSN)"
2 changes: 1 addition & 1 deletion lib/stdlib/test/io_proto_SUITE.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2009-2024. All Rights Reserved.
%% Copyright Ericsson AB 2009-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
10 changes: 10 additions & 0 deletions lib/tftp/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ limitations under the License.
-->
# TFTP Release Notes

## Tftp 1.2.2

### Fixed Bugs and Malfunctions

- Fix specs in tftp:read_file function.

Own Id: OTP-19446 Aux Id: [PR-9327], ERIERL-1179

[PR-9327]: https://github.com/erlang/otp/pull/9327

## Tftp 1.2.1

### Improvements and New Features
Expand Down
2 changes: 1 addition & 1 deletion lib/tftp/src/tftp.erl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2005-2024. All Rights Reserved.
%% Copyright Ericsson AB 2005-2025. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion lib/tftp/vsn.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
# %CopyrightEnd%

APPLICATION = tftp
TFTP_VSN = 1.2.1
TFTP_VSN = 1.2.2
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(TFTP_VSN)$(PRE_VSN)"
61 changes: 0 additions & 61 deletions make/otp_version_tickets_in_merge
Original file line number Diff line number Diff line change
@@ -1,61 +0,0 @@
OTP-16607
OTP-19158
OTP-19221
OTP-19223
OTP-19225
OTP-19232
OTP-19234
OTP-19243
OTP-19248
OTP-19253
OTP-19260
OTP-19261
OTP-19264
OTP-19270
OTP-19273
OTP-19280
OTP-19281
OTP-19282
OTP-19283
OTP-19284
OTP-19289
OTP-19292
OTP-19299
OTP-19300
OTP-19301
OTP-19302
OTP-19304
OTP-19305
OTP-19307
OTP-19309
OTP-19310
OTP-19318
OTP-19320
OTP-19321
OTP-19322
OTP-19329
OTP-19330
OTP-19331
OTP-19333
OTP-19335
OTP-19338
OTP-19341
OTP-19342
OTP-19344
OTP-19351
OTP-19353
OTP-19356
OTP-19359
OTP-19360
OTP-19361
OTP-19362
OTP-19363
OTP-19368
OTP-19370
OTP-19372
OTP-19373
OTP-19375
OTP-19377
OTP-19379
OTP-19380
OTP-19387
1 change: 1 addition & 0 deletions otp_versions.table
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
OTP-27.2.1 : common_test-1.27.6 dialyzer-5.3.1 erts-15.2.1 kernel-10.2.1 ssh-5.2.6 tftp-1.2.2 # asn1-5.3.1 compiler-8.5.4 crypto-5.5.2 debugger-5.5 diameter-2.4.1 edoc-1.3.2 eldap-1.2.14 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3.1 jinterface-1.14.1 megaco-4.7 mnesia-4.23.3 observer-2.17 odbc-2.15 os_mon-2.10.1 parsetools-2.6 public_key-1.17 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.18 ssl-11.2.6 stdlib-6.2 syntax_tools-3.2.1 tools-4.1.1 wx-2.4.3 xmerl-2.1 :
OTP-27.2 : common_test-1.27.5 compiler-8.5.4 crypto-5.5.2 debugger-5.5 dialyzer-5.3 eldap-1.2.14 erts-15.2 inets-9.3.1 kernel-10.2 megaco-4.7 mnesia-4.23.3 observer-2.17 os_mon-2.10.1 public_key-1.17 snmp-5.18 ssh-5.2.5 ssl-11.2.6 stdlib-6.2 tools-4.1.1 # asn1-5.3.1 diameter-2.4.1 edoc-1.3.2 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 jinterface-1.14.1 odbc-2.15 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 syntax_tools-3.2.1 tftp-1.2.1 wx-2.4.3 xmerl-2.1 :
OTP-27.1.3 : common_test-1.27.4 compiler-8.5.3 erts-15.1.3 kernel-10.1.2 public_key-1.16.4 ssh-5.2.4 ssl-11.2.5 # asn1-5.3.1 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 stdlib-6.1.2 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :
OTP-27.1.2 : common_test-1.27.3 erts-15.1.2 kernel-10.1.1 ssh-5.2.3 ssl-11.2.4 stdlib-6.1.2 # asn1-5.3.1 compiler-8.5.2 crypto-5.5.1 debugger-5.4 dialyzer-5.2.1 diameter-2.4.1 edoc-1.3.2 eldap-1.2.13 erl_interface-5.5.2 et-1.7.1 eunit-2.9.1 ftp-1.2.3 inets-9.3 jinterface-1.14.1 megaco-4.6 mnesia-4.23.2 observer-2.16 odbc-2.15 os_mon-2.10 parsetools-2.6 public_key-1.16.3 reltool-1.0.1 runtime_tools-2.1.1 sasl-4.2.2 snmp-5.17 syntax_tools-3.2.1 tftp-1.2.1 tools-4.1 wx-2.4.3 xmerl-2.1 :
Expand Down