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 c9702d3d9fbe0281962601e9922fee912e351f2b Merge: a2d9cd987c 92cb4c500a Author: remm <[email protected]> AuthorDate: Thu Oct 8 17:42:33 2026 +0200 Merge branch 'main' of [email protected]:apache/tomcat.git into main java/org/apache/catalina/mapper/Mapper.java | 3 +- .../apache/catalina/mbeans/BaseCatalinaMBean.java | 3 + .../catalina/mbeans/BaseNamingResourceMBean.java | 78 ++++++++++++++++++++++ .../org/apache/catalina/mbeans/ConnectorMBean.java | 3 +- .../org/apache/catalina/mbeans/ContainerMBean.java | 7 +- .../catalina/mbeans/ContextEnvironmentMBean.java | 54 ++++++++++----- java/org/apache/catalina/mbeans/ContextMBean.java | 3 +- .../catalina/mbeans/ContextResourceLinkMBean.java | 26 ++++---- .../catalina/mbeans/ContextResourceMBean.java | 41 +++++++----- .../mbeans/DataSourceUserDatabaseMBean.java | 2 +- .../apache/catalina/mbeans/LocalStrings.properties | 2 + java/org/apache/catalina/mbeans/MBeanDumper.java | 1 + java/org/apache/catalina/mbeans/MBeanUtils.java | 4 +- java/org/apache/catalina/mbeans/ServiceMBean.java | 4 +- .../TesterApplicationHttpRequestPerformance.java | 3 + 15 files changed, 171 insertions(+), 63 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
