Conflicts:
	.gitlab-ci.yml
	CMakeIncludes/dependencies.cmake
	common/cpp/CMakeLists.txt
	consumer/api/cpp/src/tcp_consumer_client.cpp
	deploy/asapo_services/Dockerfile
	deploy/asapo_services/Dockerfile.in
	deploy/asapo_services/asap3.tfvars
	deploy/asapo_services/scripts/asapo-brokers.nmd.tpl
	deploy/asapo_services/scripts/asapo-fts.nmd.tpl
	deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
	deploy/asapo_services/scripts/asapo-services.nmd.tpl
	deploy/asapo_services/scripts/asapo.auto.tfvars.in
	deploy/asapo_services/scripts/templates.tf

* commit '0bdea405':
  update docs for 22.03.0

* commit '7f57f4d4':
  fix win test
  update noamd resources, changelog
  added cache_only mode, tests

* commit '8ca6667e': (48 commits)
  fix bug when cache_size=0
  fix tests
  update clients
  fix tests
  remove new format, change protocol number
  deployment finished
  add monitoring proxy and ui to deployment
  added monitoring server to nomad deployment
  fix docker build
  fix cmake
  added monitoring to config and tests
  fix coverage
  fix mem leaks
  fix build with protobuf
  fix memleaks and race conditions
  refactor request statistics
  fix kafka test
  fix test
  fix tests
  fix memleaks, python tests
  ...