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:22 UTC

[dubbo] 29/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 e9d73729cf9478ffecf2cab04192eb32b2ae4740
Merge: d89027f216 321789d813
Author: Xin Wang <xi...@gmail.com>
AuthorDate: Thu Aug 12 11:07:48 2021 +0800

    Merge remote-tracking branch 'dubbo_rem/master'

 .../org/apache/dubbo/rpc/cluster/Constants.java    |   1 -
 dubbo-dependencies-bom/pom.xml                     |  16 +-
 .../dubbo-dependencies-zookeeper/pom.xml           |   2 +-
 .../java/org/apache/dubbo/registry/Constants.java  |   4 +
 .../client/OverrideInstanceAddressURL.java         | 276 +++++++++++++++++++++
 .../client/ServiceDiscoveryRegistryDirectory.java  | 169 +++++++++++++
 .../registry/integration/RegistryProtocol.java     |   5 +-
 .../remoting/exchange/support/DefaultFuture.java   |   5 -
 .../exchange/support/DefaultFutureTest.java        |  11 +
 .../rpc/protocol/hessian/HessianProtocolTest.java  |  25 +-
 pom.xml                                            |   2 +-
 11 files changed, 489 insertions(+), 27 deletions(-)