dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEPRECATED - deprecated. Revert ENTITY_MERGE_RPC_MESSAGE and set as deprecated

Browse Source
This commit is contained in:
Volodymyr Babak 2023-01-24 12:56:20 +02:00
parent ecd1fa1981
commit 08114319eb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
View File

@ -34,5 +34,5 @@ public enum EdgeEventActionType {
ASSIGNED_TO_EDGE, ASSIGNED_TO_EDGE,
UNASSIGNED_FROM_EDGE, UNASSIGNED_FROM_EDGE,
CREDENTIALS_REQUEST, CREDENTIALS_REQUEST,
ENTITY_MERGE_REQUEST // DEPRECATED ENTITY_MERGE_REQUEST // deprecated
} }

1
common/edge-api/src/main/proto/edge.proto
View File

@ -111,6 +111,7 @@ enum UpdateMsgType {
ENTITY_DELETED_RPC_MESSAGE = 2; ENTITY_DELETED_RPC_MESSAGE = 2;
ALARM_ACK_RPC_MESSAGE = 3; ALARM_ACK_RPC_MESSAGE = 3;
ALARM_CLEAR_RPC_MESSAGE = 4; ALARM_CLEAR_RPC_MESSAGE = 4;
ENTITY_MERGE_RPC_MESSAGE = 5; // deprecated
} }
message EntityDataProto { message EntityDataProto {