Commit ab25a077 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch '88-alya-create-a-new-data-distributor' of...

Merge branch '88-alya-create-a-new-data-distributor' of https://storage.bsc.es/gitlab/hpc/gekkofs into 88-alya-create-a-new-data-distributor

Conflicts:
	include/global/rpc/distributor.hpp
	src/client/preload.cpp
parents 8a1efd80 e319a5ca
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment