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

common_requirements.in

0 → 100644
+8 −0
Original line number Diff line number Diff line 
coverage==6.3

grpcio==1.47.*

grpcio-health-checking==1.47.*

grpcio-tools==1.47.*

prometheus-client==0.13.0

protobuf==3.20.*

pytest==6.2.5

pytest-benchmark==3.4.1

data/.gitignore

+1 −0
Original line number Diff line number Diff line 
!.gitkeep

*.dot

*.xml

proto/src/java/.gitignore

+1 −4
Original line number Diff line number Diff line 
*



# used to prevent breaking symbolic links from source code folders

!.gitignore

!__init__.py
 
!.gitkeep

proto/src/java/.gitkeep

0 → 100644
+0 −0

Empty file added.

proto/src/python/.gitignore

+2 −2
Original line number Diff line number Diff line 
*

!.gitkeep



# used to prevent breaking symbolic links from source code folders

!.gitignore

# prevent breaking symbolic links on Python source code folders

!__init__.py