Merge with master

This commit is contained in:
Igor Kulikov 2018-10-03 19:20:47 +03:00
parent 7d7d5cbdbc
commit f7f6045800

View File

@ -5,7 +5,8 @@ COAP_BIND_ADDRESS=0.0.0.0
COAP_BIND_PORT=5683 COAP_BIND_PORT=5683
# type of database to use: sql[DEFAULT] or cassandra # type of database to use: sql[DEFAULT] or cassandra
DATABASE_TYPE=sql DATABASE_TS_TYPE=sql
DATABASE_ENTITIES_TYPE=sql
SQL_DATA_FOLDER=/usr/share/thingsboard/data/db SQL_DATA_FOLDER=/usr/share/thingsboard/data/db
# cassandra db config # cassandra db config