Igor Kulikov cd30e9a4b1 Fix merge conflicts

2022-05-19 12:31:00 +03:00

..

actor

Revert "BurstTbRuleEngineSubmitStrategy debug notes to fix the long-running testTheCopyOfAttrsIntoTSForTheView"

2022-04-19 15:57:02 +03:00

cache

Move Device Cache to common package

2022-05-13 10:11:06 +03:00

cluster-api

Version set to 3.4.0-SNAPSHOT

2022-02-21 12:19:59 +02:00

coap-server

Version set to 3.4.0-SNAPSHOT

2022-02-21 12:19:59 +02:00

dao-api

Merge with develop/3.4

2022-05-17 17:00:25 +03:00

data

Fix merge conflicts

2022-05-19 12:31:00 +03:00

edge-api

Version set to 3.4.0-SNAPSHOT

2022-02-21 12:19:59 +02:00

message

QueueToRuleEngineMsg improved toString with call super

2022-04-19 12:50:52 +03:00

queue

revert extra log on poll InMemoryTbQueueConsumer

2022-04-19 15:59:29 +03:00

stats

Version set to 3.4.0-SNAPSHOT

2022-02-21 12:19:59 +02:00

transport

Merge pull request #6240 from ShvaykaD/feature/6233

2022-04-25 13:03:46 +03:00

util

Merge with master

2022-03-15 12:42:18 +02:00

version-control

Fix merge conflicts

2022-05-19 12:31:00 +03:00

pom.xml

Rename Data structures. Create separate module.

2022-05-18 10:40:02 +03:00