Skip to content
Commit 8a4dcd32 authored by francisco.moreno.external@atos.net's avatar francisco.moreno.external@atos.net
Browse files

Merge remote-tracking branch 'origin/develop' into feat/monitoring

# Conflicts:
#	src/monitoring/client/MonitoringClient.py
#	src/monitoring/proto/monitoring_pb2.py
#	src/monitoring/proto/monitoring_pb2_grpc.py
#	src/monitoring/service/MonitoringServiceServicerImpl.py
#	src/monitoring/tests/test_unitary.py
parents 917f709d ac377681
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