Albumen Kevin a278feb372 Merge branch 'apache-3.1' into apache-3.2 ... # Conflicts: # dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java # dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapper.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscovery.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java # dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosNamingServiceWrapperTest.java # dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosRegistryTest.java		2023-01-11 15:05:01 +08:00
..
src/main	Merge branch 'apache-3.1' into apache-3.2	2023-01-11 15:05:01 +08:00
pom.xml	Add coverage module & file lint test (#10920)	2022-11-12 14:39:33 +08:00