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

Posted to commits@dubbo.apache.org by li...@apache.org on 2019/08/13 12:31:26 UTC

[dubbo] 06/13: Merge remote-tracking branch 'origin/cloud-native' into cloud-native

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 eb62f48a3f5e25c8b686ec2a9a8fe80a7f2d0f94
Merge: 705ee97 b2f3307
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Aug 12 17:26:12 2019 +0800

    Merge remote-tracking branch 'origin/cloud-native' into cloud-native
    
    # Conflicts:
    #	dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/ConsulServiceDiscovery.java

 .../configcenter/AbstractDynamicConfiguration.java |  52 ++++--
 .../config/configcenter/DynamicConfiguration.java  |   3 +
 .../file/FileSystemDynamicConfiguration.java       | 101 +++---------
 .../org/apache/dubbo/config/AbstractConfig.java    |  15 ++
 .../apache/dubbo/config/context/ConfigManager.java | 182 ++++++++++++---------
 .../ConfigurableMetadataServiceExporter.java       |   1 -
 .../dubbo/metadata/MetadataServiceExporter.java    |   1 -
 .../dubbo-metadata-definition-protobuf/pom.xml     |   3 +-
 .../metadata/RefreshServiceMetadataCustomizer.java |   1 -
 .../registry/consul/AbstractConsulRegistry.java    |   4 -
 .../dubbo/registry/etcd/EtcdServiceDiscovery.java  |   1 -
 11 files changed, 192 insertions(+), 172 deletions(-)