You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@dubbo.apache.org by wa...@apache.org on 2023/05/31 03:10:17 UTC

[dubbo] 24/36: Merge remote-tracking branch 'dubbo_rem/master'

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

wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 989ee68f6a0325235aca66f03a1ec500cbca17ef
Merge: b419a17e9e 3548eab668
Author: Xin Wang <xi...@gmail.com>
AuthorDate: Mon Jul 12 14:06:41 2021 +0800

    Merge remote-tracking branch 'dubbo_rem/master'

 .../support/MergeableClusterInvokerTest.java       |  3 +-
 .../apache/dubbo/common/config/Environment.java    |  5 ++
 .../dubbo/common/extension/ExtensionLoader.java    |  2 +
 .../apache/dubbo/config/ConfigCenterConfig.java    | 20 +++++--
 .../apache/dubbo/config/MetadataReportConfig.java  | 63 +++++++++++++++++--
 .../org/apache/dubbo/config/RegistryConfig.java    |  5 --
 .../org/apache/dubbo/config/DubboShutdownHook.java | 19 ++++--
 .../dubbo/config/bootstrap/DubboBootstrap.java     | 18 +++---
 .../config/utils/ReferenceConfigCacheTest.java     |  2 +
 .../src/main/resources/META-INF/dubbo.xsd          | 10 ++++
 .../support/nacos/NacosDynamicConfiguration.java   | 10 +++-
 .../telnet/support/TelnetHandlerAdapter.java       |  4 +-
 .../telnet/support/TelnetHandlerAdapterTest.java   | 70 ++++++++++++++++++++++
 13 files changed, 198 insertions(+), 33 deletions(-)