This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 36e1a1c0acf1625fa16204f1b4eeb8f45abfbd81
Merge: c8ca5b6 733473f
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Tue Aug 13 20:30:53 2019 +0800
Merge remote-tracking branch 'origin/cloud-native' into cloud-native
# Conflicts:
#
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
#
dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 10 +-
.../org/apache/dubbo/config/AbstractConfig.java | 3 +-
.../apache/dubbo/config/context/ConfigManager.java | 135 ++++++++-------
.../dubbo/config/context/ConfigManagerTest.java | 186 ++++++++++++++++++++-
.../apache/dubbo/metadata/MetadataConstants.java | 1 +
.../identifier/BaseServiceMetadataIdentifier.java | 3 +
.../identifier/ServiceMetadataIdentifier.java | 10 +-
.../report/support/AbstractMetadataReport.java | 4 +-
.../report/support/AbstractMetadataReportTest.java | 4 +-
.../metadata/test/JTestMetadataReport4Test.java | 2 +-
.../store/consul/ConsulMetadataReport.java | 2 +-
.../metadata/store/etcd/EtcdMetadataReport.java | 2 +-
.../metadata/store/nacos/NacosMetadataReport.java | 2 +-
.../metadata/store/redis/RedisMetadataReport.java | 2 +-
.../store/zookeeper/ZookeeperMetadataReport.java | 14 +-
.../metadata/RefreshServiceMetadataCustomizer.java | 6 +-
.../proxy/BaseMetadataServiceProxyFactory.java | 3 +-
.../metadata/proxy/RemoteMetadataServiceProxy.java | 4 +-
.../registry/service/ServiceOrientedRegistry.java | 2 +
19 files changed, 301 insertions(+), 94 deletions(-)
