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

Merge branch 'master' into develop/1.5

Browse Source
This commit is contained in:
Igor Kulikov 2018-04-03 14:53:28 +03:00
commit a2d56c2e45
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dao/src/main/java/org/thingsboard/server/dao/model/nosql/AuditLogEntity.java
View File

@ -36,7 +36,7 @@ import java.util.UUID;
import static org.thingsboard.server.dao.model.ModelConstants.*; import static org.thingsboard.server.dao.model.ModelConstants.*;
@Table(name = AUDIT_LOG_COLUMN_FAMILY_NAME) @Table(name = AUDIT_LOG_BY_ENTITY_ID_CF)
@Data @Data
@NoArgsConstructor @NoArgsConstructor
public class AuditLogEntity implements BaseEntity<AuditLog> { public class AuditLogEntity implements BaseEntity<AuditLog> {

2
pom.xml
View File

@ -41,7 +41,7 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<mockito.version>1.9.5</mockito.version> <mockito.version>1.9.5</mockito.version>
<rat.version>0.10</rat.version> <rat.version>0.10</rat.version>
<cassandra.version>3.0.0</cassandra.version> <cassandra.version>3.0.7</cassandra.version>
<cassandra-unit.version>3.0.0.1</cassandra-unit.version> <cassandra-unit.version>3.0.0.1</cassandra-unit.version>
<takari-cpsuite.version>1.2.7</takari-cpsuite.version> <takari-cpsuite.version>1.2.7</takari-cpsuite.version>
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>