Commit 7531fc55 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF_685' into 'STF_707_TASK3' 

Merge stuff from STF 685 into STF_707_TASK3

See merge request !19
parents 7aa814d9 d81746f3

.gitignore

+11 −0
Changes for .gitignore: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,3 +7,14 @@ vendor/ 
dist/

bin

examples/demo1/bin

playbooks/ansible-venv/

js-apps/meep-frontend/.build_checksum

config/objstore-thanos-archive.yaml

config/objstore-thanos.yaml

config/permissions.yaml

config/secrets.yaml

.meepctl-repocfg.yaml

config/api/

charts/grafana/dashboards/mec-sandbox.json

deploy/pyinfra/.env

deploy/pyinfra/pyinfra-venv/
 
 No newline at end of file

.gitmodules

+1 −1
Changes for .gitmodules: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
[submodule "etsi-mec-sandbox-frontend"]

	path = etsi-mec-sandbox-frontend

	url = https://labs.etsi.org/rep/mec/etsi-mec-sandbox-frontend.git

	branch = STF678_Task4
 
	branch = STF_685

.meepctl-repocfg.yaml

deleted100644 → 0
+0 −1602

File deleted.

Preview size limit exceeded, changes collapsed.