Skip to content
Snippets Groups Projects
Commit 4d3d1d78 authored by Michael Davis's avatar Michael Davis
Browse files

Merge branch 'migration_ci_tests' of https://gitlab.cern.ch:8443/cta/CTA into migration_ci_tests

Conflicts:
	continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
	migration/gRPC/CMakeLists.txt
	migration/gRPC/EosImportDirs.cpp
	migration/gRPC/EosImportDirs.hpp
	migration/gRPC/EosImportDirsCmd.cpp
	migration/gRPC/EosImportFiles.cpp
	migration/gRPC/GrpcClient.cpp
	migration/gRPC/GrpcClient.hpp
	migration/gRPC/GrpcUtils.cpp
parents e219e6f5 81aaf417
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment