Skip to content
Snippets Groups Projects
Commit 81651fca authored by George Sedov's avatar George Sedov
Browse files

Merge branch 'feature_ASAPO-161-migrate-to-gitlab'

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
parents 2e732e74 a8a70bbc
Branches
Tags
No related merge requests found
Showing
with 465 additions and 56 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment