Skip to content

Commit

Permalink
Merge branch 'maint-25' into maint
Browse files Browse the repository at this point in the history
* maint-25:
  Updated OTP version
  Prepare release
  Update copyright year
  • Loading branch information
jhogberg committed Feb 12, 2025
2 parents ff6d659 + 2915bea commit 5e883a9
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 0 deletions.
8 changes: 8 additions & 0 deletions erts/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,14 @@ This document describes the changes made to the ERTS application.

Own Id: OTP-18574

## Erts 13.2.2.13

### Fixed Bugs and Malfunctions

* Disabled an unsafe runtime optimization in binary construction that caused silent memory corruption.

Own Id: OTP-19462 Aux Id: ERIERL-1177, PR-9372

## Erts 13.2.2.12

### Fixed Bugs and Malfunctions
Expand Down
8 changes: 8 additions & 0 deletions lib/common_test/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@ limitations under the License.

Own Id: OTP-18478 Aux Id: GH-6903

## Common_Test 1.24.0.6

### Fixed Bugs and Malfunctions

* Common test will now not crash when running tests with OTP-26 and earlier, while having previous test results from OTP-27.

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

## Common_Test 1.24.0.5

### Fixed Bugs and Malfunctions
Expand Down
8 changes: 8 additions & 0 deletions lib/kernel/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,14 @@ This document describes the changes made to the Kernel application.

Own Id: OTP-18575 Aux Id: PR-7169

## Kernel 8.5.4.4

### Fixed Bugs and Malfunctions

* Fixed a couple of bugs that could make `global`'s internal state inconsistent when a connection was reconnected.

Own Id: OTP-19381 Aux Id: PR-9377, GH-9112, GH-9117

## Kernel 8.5.4.3

### Fixed Bugs and Malfunctions
Expand Down
14 changes: 14 additions & 0 deletions lib/ssh/doc/notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,20 @@ limitations under the License.

Own Id: OTP-18490 Aux Id: OTP-18471, GH-6339, PR-6843

## Ssh 4.15.3.9

### 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

## Ssh 4.15.3.8

### Fixed Bugs and Malfunctions
Expand Down
1 change: 1 addition & 0 deletions otp_versions.table
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ OTP-26.1 : asn1-5.2 common_test-1.25.1 compiler-8.4 crypto-5.3 debugger-5.3.2 di
OTP-26.0.2 : compiler-8.3.2 erts-14.0.2 kernel-9.0.2 ssh-5.0.1 ssl-11.0.2 stdlib-5.0.2 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 inets-9.0.1 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 xmerl-1.3.32 :
OTP-26.0.1 : compiler-8.3.1 erts-14.0.1 inets-9.0.1 kernel-9.0.1 ssl-11.0.1 stdlib-5.0.1 xmerl-1.3.32 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 :
OTP-26.0 : asn1-5.1 common_test-1.25 compiler-8.3 crypto-5.2 dialyzer-5.1 diameter-2.3 erl_docgen-1.5 erl_interface-5.4 erts-14.0 et-1.7 ftp-1.2 inets-9.0 jinterface-1.14 kernel-9.0 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 ssl-11.0 stdlib-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 # debugger-5.3.1 edoc-1.2 eldap-1.2.11 eunit-2.8.2 xmerl-1.3.31 :
OTP-25.3.2.17 : common_test-1.24.0.6 erts-13.2.2.13 kernel-8.5.4.4 ssh-4.15.3.9 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.5 jinterface-1.13.2 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.5 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.7 stdlib-4.3.1.6 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
OTP-25.3.2.16 : common_test-1.24.0.5 erts-13.2.2.12 inets-8.3.1.5 public_key-1.13.3.5 ssh-4.15.3.8 ssl-10.9.1.7 stdlib-4.3.1.6 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
OTP-25.3.2.15 : common_test-1.24.0.4 erts-13.2.2.11 inets-8.3.1.4 public_key-1.13.3.4 ssh-4.15.3.7 ssl-10.9.1.6 stdlib-4.3.1.5 # asn1-5.0.21.1 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.2 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.2 :
OTP-25.3.2.14 : diameter-2.2.7.2 public_key-1.13.3.3 ssh-4.15.3.6 xmerl-1.3.31.2 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 erts-13.2.2.10 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 :
Expand Down

0 comments on commit 5e883a9

Please sign in to comment.