This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 330dfc42f9f363f2f326c7bf312bf37eb079c02f Merge: 376fc143b0 92bf15dee2 Author: Albumen Kevin <[email protected]> AuthorDate: Sun Jul 10 16:52:17 2022 +0800 Merge branch 'apache-3.0' into apache-3.1 .../org/apache/dubbo/rpc/model/FrameworkModel.java | 6 +++--- .../dubbo/registry/retry/AbstractRetryTask.java | 2 +- .../dubbo/registry/support/AbstractRegistry.java | 2 +- .../support/CacheableFailbackRegistry.java | 4 +--- .../dubbo/registry/support/FailbackRegistry.java | 16 +++++++-------- .../registry/zookeeper/ZookeeperRegistry.java | 12 +++++------ .../zookeeper/AbstractZookeeperClient.java | 8 +++----- .../zookeeper/AbstractZookeeperTransporter.java | 12 +++++------ .../remoting/zookeeper/ZookeeperTransporter.java | 7 +------ .../zookeeper/curator/CuratorZookeeperClient.java | 24 ++++++++-------------- 10 files changed, 37 insertions(+), 56 deletions(-)
