From 08114319ebdf52d574643aae8fb2d22857a8f171 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 24 Jan 2023 12:56:20 +0200
Subject: [PATCH] DEPRECATED - deprecated. Revert ENTITY_MERGE_RPC_MESSAGE and
 set as deprecated

---
 .../server/common/data/edge/EdgeEventActionType.java            | 2 +-
 common/edge-api/src/main/proto/edge.proto                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 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
index b13dfb89c9..cbd532b479 100644
--- 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
 }
\ No newline at end of file
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index b33798b525..bf512467cc 100644
--- 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 {