This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a121903ccb3354ab38ccdfa21b5ac4c0ecf4d1f2
Merge: 48dab12c50 0894c655fd
Author: remm <[email protected]>
AuthorDate: Tue Oct 27 10:46:32 2026 +0100

    Merge branch 'main' of [email protected]:apache/tomcat.git into main

 java/org/apache/coyote/http2/Http2AsyncParser.java                | 8 ++++++--
 .../org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java  | 1 +
 .../java/org/apache/tomcat/jdbc/naming/TestNamingFactory.java     | 2 +-
 .../apache/tomcat/jdbc/pool/TestDisposableConnectionFacade.java   | 4 ++--
 .../apache/tomcat/jdbc/pool/TestProxyKindAfterDataSourceSwap.java | 2 --
 .../tomcat/jdbc/pool/interceptor/TestSlowQueryEviction.java       | 1 -
 .../tomcat/jdbc/pool/interceptor/TestStatementFinalizer.java      | 1 +
 .../{TestSecurity2019.java => TestSecurity2019Tomcat.java}        | 2 +-
 .../{TestSecurity2023.java => TestSecurity2023Tomcat.java}        | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to