thingsboard-memoizeit

Fixes

10/9/2018 2:15:23 PM

Volodymyr Babak

Commit: 0cfb731

Tree: ee9325e

Parents: befb89a

Changes

application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java 2(+1 -1)

application/src/test/java/org/thingsboard/server/rules/RuleEngineNoSqlTestSuite.java 4(+2 -2)

ui/src/app/locale/locale.constant-en_US.json 2(+1 -1)

Details

application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java 2(+1 -1)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java
index d57371f..65c8884 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraDatabaseUpgradeService.java
@@ -224,7 +224,7 @@ public class CassandraDatabaseUpgradeService implements DatabaseUpgradeService {
 
             case "2.1.1":
 
-                log.info("Upgrading Cassandara DataBase from version {} to 2.1.1 ...", fromVersion);
+                log.info("Upgrading Cassandara DataBase from version {} to 2.1.2 ...", fromVersion);
 
                 cluster.getSession();

application/src/test/java/org/thingsboard/server/rules/RuleEngineNoSqlTestSuite.java 4(+2 -2)

diff --git a/application/src/test/java/org/thingsboard/server/rules/RuleEngineNoSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/rules/RuleEngineNoSqlTestSuite.java
index c910cad..c1d1e6c 100644
--- a/application/src/test/java/org/thingsboard/server/rules/RuleEngineNoSqlTestSuite.java
+++ b/application/src/test/java/org/thingsboard/server/rules/RuleEngineNoSqlTestSuite.java
@@ -26,8 +26,8 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
-        "org.thingsboard.server.rules.flow.nosql.RuleEngineFlowNoSqlIntegrationTest",
-//        "org.thingsboard.server.rules.lifecycle.nosql.*Test"
+        "org.thingsboard.server.rules.flow.nosql.*Test",
+        "org.thingsboard.server.rules.lifecycle.nosql.*Test"
 })
 public class RuleEngineNoSqlTestSuite {

ui/src/app/locale/locale.constant-en_US.json 2(+1 -1)

diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 276b432..299b5d4 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -844,7 +844,7 @@
         "client-attributes": "Client attributes",
         "shared-attributes": "Shared attributes",
         "server-attributes": "Server attributes",
-        "latest-timeseries": "Latest timeseries",
+        "latest-timeseries": "Latest timeseries"
     },
     "event": {
         "event-type": "Event type",