DEPRECATED - deprecated. Revert ENTITY_MERGE_RPC_MESSAGE and set as deprecated

4 years ago · 08114319eb
2 changed files with 2 additions and 1 deletions
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
@ -34,5 +34,5 @@ public enum EdgeEventActionType {
    ASSIGNED_TO_EDGE,
    UNASSIGNED_FROM_EDGE,
    CREDENTIALS_REQUEST,
-    ENTITY_MERGE_REQUEST // DEPRECATED
+    ENTITY_MERGE_REQUEST // deprecated
 }
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@ -111,6 +111,7 @@ enum UpdateMsgType {
  ENTITY_DELETED_RPC_MESSAGE = 2;
  ALARM_ACK_RPC_MESSAGE = 3;
  ALARM_CLEAR_RPC_MESSAGE = 4;
  ENTITY_MERGE_RPC_MESSAGE = 5; // deprecated
 }
 message EntityDataProto {