Open-source IoT Platform - Device management, data collection, processing and visualization.
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Viacheslav Klimov
a00e3be7ba
Merge branch 'master' into master-to-develop-snmp
# Conflicts:
# common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
# common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
# common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
# common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
# dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
# pom.xml
|
5 years ago |
| .. |
|
src
|
Merge branch 'master' into master-to-develop-snmp
|
5 years ago |
|
pom.xml
|
Merge branch 'master' into master-to-develop-snmp
|
5 years ago |