ViacheslavKlimov e4cbbb0c5d Merge branch 'master' into feature/parallel-core-consumer ...

# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java

2024-03-20 12:26:41 +02:00

..

actor

Merge branch 'master' into develop/3.7

2024-03-19 15:44:23 +02:00

cache

Merge pull request #9225 from dashevchenko/tls_for_redis

2024-02-08 14:02:40 +02:00

cluster-api

Fix conflicts

2024-02-12 14:30:38 +02:00

coap-server

lwm2m_coap: DTLS Cid Length

2024-02-12 13:31:38 +02:00

dao-api

Merge branch 'master' into develop/3.7

2024-03-19 15:44:23 +02:00

data

Merge branch 'master' into feature/parallel-core-consumer

2024-03-20 12:26:41 +02:00

edge-api

Merge remote-tracking branch 'upstream/master' into develop/3.7

2024-01-16 11:49:43 +02:00

message

Merge branch 'master' into develop/3.7

2024-03-19 15:44:23 +02:00

proto

Merge branch 'master' into develop/3.7

2024-03-19 15:44:23 +02:00

queue

Merge branch 'master' into feature/parallel-core-consumer

2024-03-20 12:26:41 +02:00

script

Merge branch 'master' into develop/3.7

2024-03-19 15:44:23 +02:00

stats

Version set to 3.7.0-SNAPSHOT

2024-01-16 11:43:44 +02:00

transport

Ignore invalid lwm2m tests

2024-03-19 16:28:52 +02:00

util

Merge branch 'master' into feature/parallel-core-consumer

2024-03-20 12:26:41 +02:00

version-control

merge with master

2024-02-06 22:40:27 +01:00

pom.xml

Version set to 3.7.0-SNAPSHOT

2024-01-16 11:43:44 +02:00