Commit a2d56c2e456181ca3afbc525b439bdd3f456153b

Authored by Igor Kulikov
2 parents fb934f86 a6661147

Merge branch 'master' into develop/1.5

... ... @@ -36,7 +36,7 @@ import java.util.UUID;
36 36
37 37 import static org.thingsboard.server.dao.model.ModelConstants.*;
38 38
39   -@Table(name = AUDIT_LOG_COLUMN_FAMILY_NAME)
  39 +@Table(name = AUDIT_LOG_BY_ENTITY_ID_CF)
40 40 @Data
41 41 @NoArgsConstructor
42 42 public class AuditLogEntity implements BaseEntity<AuditLog> {
... ...
... ... @@ -41,7 +41,7 @@
41 41 <logback.version>1.2.3</logback.version>
42 42 <mockito.version>1.9.5</mockito.version>
43 43 <rat.version>0.10</rat.version>
44   - <cassandra.version>3.0.0</cassandra.version>
  44 + <cassandra.version>3.0.7</cassandra.version>
45 45 <cassandra-unit.version>3.0.0.1</cassandra-unit.version>
46 46 <takari-cpsuite.version>1.2.7</takari-cpsuite.version>
47 47 <guava.version>18.0</guava.version>
... ...