Merge branch 'main' into main-dev

Tencent · Aug 2, 2022 · dddbe35 · dddbe35
2 parents d7bdf4d + 4ed19e2
commit dddbe35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,3 +2,4 @@
 ---
 
 - [Feature: support ribbon service-level rule customization](https://github.com/Tencent/spring-cloud-tencent/pull/478)
+- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/481)
diff --git a/...laris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java b/...laris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java
@@ -30,7 +30,6 @@
 import org.apache.commons.lang.StringUtils;
 
 import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
@@ -40,7 +39,7 @@
  *
  * @author Haotian Zhang, Andrew Shan, Jie Cheng, Palmer.Xu
  */
-public class PolarisRegistration implements Registration, ServiceInstance {
+public class PolarisRegistration implements Registration {
 
 	private final static String METADATA_KEY_IP = "internal-ip";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		---

		- [Feature: support ribbon service-level rule customization](https://github.com/Tencent/spring-cloud-tencent/pull/478)
		- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/481)