Igor Kulikov 934020d184 Fix conflicts

2021-07-01 20:02:20 +03:00

..

actor

tests: refactored actor system Test (Thread.sleep replaced with countDownLatch)

2021-06-17 12:57:31 +03:00

cache

fixed OtaPackage data cache

2021-06-02 12:24:24 +03:00

coap-server

Use hybrid client authentication for DTLS CoAP transport

2021-07-01 14:03:03 +03:00

dao-api

Merge pull request #4682 from thingsboard/feature/cleanup-call-deduplication

2021-06-23 19:33:48 +03:00

data

ResourceUtil implementation

2021-06-30 18:04:06 +03:00

edge-api

ResourceUtil implementation

2021-06-30 18:04:06 +03:00

message

merge with master

2021-06-22 15:46:39 +03:00

queue

added power mode to lwm2m-device-profile-transport-configuration

2021-06-24 10:53:35 +03:00

stats

Version set to 3.3.0-SNAPSHOT

2021-04-09 12:37:08 +03:00

transport

Fix conflicts

2021-07-01 20:02:20 +03:00

util

OTA Info store and client lookup

2021-06-24 19:31:16 +03:00

pom.xml

Merge remote-tracking branch 'upstream/master' into develop/3.3-edge

2021-04-09 19:04:26 +03:00