This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0-to-master in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 4b3a794668a53eee60badc987603d204b822dd08 Merge: 1ed9f16 ffdd9cc Author: ken.lj <[email protected]> AuthorDate: Fri Jun 12 10:14:30 2020 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 Conflicts: dubbo-dependencies-bom/pom.xml dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml pom.xml .../org/apache/dubbo/common/utils/NetUtils.java | 19 + dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- .../org/apache/dubbo/metadata/MetadataInfo.java | 181 ++++++++ .../org/apache/dubbo/registry/NotifyListener.java | 6 + .../registry/client/DefaultServiceInstance.java | 18 + .../dubbo/registry/client/InstanceAddressURL.java | 132 ++++++ .../dubbo/registry/client/ServiceDiscovery.java | 3 +- .../registry/client/ServiceDiscoveryRegistry.java | 491 +-------------------- .../dubbo/registry/client/ServiceInstance.java | 4 + .../client/event/ServiceInstancesChangedEvent.java | 12 +- .../listener/ServiceInstancesChangedListener.java | 113 ++++- .../registry/integration/RegistryDirectory.java | 33 ++ pom.xml | 2 +- 14 files changed, 533 insertions(+), 485 deletions(-)
