KomachiSion 5f7801b341 Merge branch 'refs/heads/upstream-develop' into summer-ospp#10374 ... # Conflicts: # client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java # client/src/main/java/com/alibaba/nacos/client/naming/cache/ServiceInfoHolder.java # client/src/test/java/com/alibaba/nacos/client/naming/NacosNamingServiceTest.java # client/src/test/java/com/alibaba/nacos/client/naming/event/InstancesChangeEventTest.java # client/src/test/java/com/alibaba/nacos/client/naming/event/InstancesChangeNotifierTest.java		2024-05-31 15:21:48 +08:00
..
src	Merge branch 'refs/heads/upstream-develop' into summer-ospp#10374	2024-05-31 15:21:48 +08:00
pom.xml	Develop synced from 2.2.2 (#10307)	2023-04-11 17:34:06 +08:00