Albumen Kevin 7a4ec6c525 Merge branch 'apache-3.2' into apache-3.3 ... # Conflicts: # README.md # dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-metadata/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/rest/springmvc/SpringMvcServiceRestMetadataResolver.java # dubbo-metadata/dubbo-metadata-rest/src/test/java/org/apache/dubbo/metadata/rest/NoAnnotationApiDemoResolverTest.java # dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsKey.java # dubbo-monitor/dubbo-monitor-common/src/main/java/org/apache/dubbo/monitor/support/CallbackConsumerContextFilter.java # pom.xml		2023-08-22 15:05:41 +08:00
..
src	Merge branch 'apache-3.2' into apache-3.3	2023-08-22 15:05:41 +08:00
pom.xml	add feign client annotation support (#12736)	2023-07-17 12:34:28 +08:00