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 155cf6122632bdcb6cda7c54bed1beb832aaf0e9
Merge: 5785b95fe2 eef6b450fc
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Fri Mar 5 09:25:08 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
.github/workflows/build-and-test.yml | 14 +++++++-------
.../cluster/router/condition/ConditionRouter.java | 6 +++++-
.../router/condition/ConditionRouterFactory.java | 2 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 2 +-
.../annotation/ServiceClassPostProcessor.java | 5 +++++
.../store/InMemoryWritableMetadataService.java | 21 +++++++++++----------
.../registry/support/AbstractRegistryFactory.java | 20 ++++++++++++++++++--
.../apache/dubbo/registry/nacos/NacosRegistry.java | 8 +++++---
.../registry/nacos/NacosServiceDiscovery.java | 7 +++++++
.../nacos/util/NacosNamingServiceUtils.java | 22 ++++++++++++++++++++++
.../zookeeper/ZookeeperServiceDiscovery.java | 3 ++-
.../dubbo/rpc/protocol/AbstractExporter.java | 9 ++++++++-
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 3 +--
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 3 ++-
.../dubbo/rpc/protocol/dubbo/DubboExporter.java | 3 +--
.../rpc/protocol/grpc/DubboHandlerRegistry.java | 9 ++++++---
.../dubbo/rpc/protocol/injvm/InjvmExporter.java | 3 +--
17 files changed, 103 insertions(+), 37 deletions(-)
