From 4df37fc0ef2675b4ce16420a746322dd45c4e26a Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 1 Jun 2020 18:16:48 +0300
Subject: [PATCH 1/3] Fix upgrade cassandra ts from 2.5.0

---
 .../service/install/CassandraTsDatabaseUpgradeService.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java
index 4bc68e92bc..103e8090d9 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java
@@ -48,6 +48,8 @@ public class CassandraTsDatabaseUpgradeService extends AbstractCassandraDatabase
                 }
                 log.info("Schema updated.");
                 break;
+            case "2.5.0":
+                break;
             default:
                 throw new RuntimeException("Unable to upgrade Cassandra database, unsupported fromVersion: " + fromVersion);
         }

From c3447c5a118220da45b9c44f3f00a12953cd4d7b Mon Sep 17 00:00:00 2001
From: nordmif <dronfim@mail.ru>
Date: Tue, 2 Jun 2020 14:21:49 +0300
Subject: [PATCH 2/3] fixing the activation of on-row event on details click

---
 ui/src/app/widget/lib/alarms-table-widget.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/src/app/widget/lib/alarms-table-widget.js b/ui/src/app/widget/lib/alarms-table-widget.js
index aa2d1cc6b8..53dd43f223 100644
--- a/ui/src/app/widget/lib/alarms-table-widget.js
+++ b/ui/src/app/widget/lib/alarms-table-widget.js
@@ -404,6 +404,9 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia
     }
 
     function openAlarmDetails($event, alarm) {
+        if ($event) {
+            $event.stopPropagation();
+        }
         if (alarm && alarm.id) {
             var onShowingCallback = {
                 onShowing: function(){}

From 26123b40f199553fe4a1d47ab1ad425fe7f10a00 Mon Sep 17 00:00:00 2001
From: Vladyslav <vprykhodko@thingsboard.io>
Date: Tue, 2 Jun 2020 22:05:55 +0300
Subject: [PATCH 3/3] Update CassandraTsDatabaseUpgradeService.java

---
 .../service/install/CassandraTsDatabaseUpgradeService.java      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java
index 103e8090d9..4bc68e92bc 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java
@@ -48,8 +48,6 @@ public class CassandraTsDatabaseUpgradeService extends AbstractCassandraDatabase
                 }
                 log.info("Schema updated.");
                 break;
-            case "2.5.0":
-                break;
             default:
                 throw new RuntimeException("Unable to upgrade Cassandra database, unsupported fromVersion: " + fromVersion);
         }