This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit a9fce6fa94bddfab1e3c76db5fedd69716f98896 Merge: cc6e1aea89 486b39f28d Author: Albumen Kevin <[email protected]> AuthorDate: Mon Jan 16 11:20:44 2023 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java .../support/nacos/NacosDynamicConfiguration.java | 11 +++- .../configcenter/support/nacos/RetryTest.java | 36 +++++++++++++ dubbo-dependencies-bom/pom.xml | 2 +- .../metadata/store/nacos/NacosMetadataReport.java | 10 +++- .../dubbo/metadata/store/nacos/RetryTest.java | 36 +++++++++++++ .../nacos/util/NacosNamingServiceUtilsTest.java | 60 ++++++++++++++++++++++ 6 files changed, 152 insertions(+), 3 deletions(-)
