Skip to content
Snippets Groups Projects
Commit 8c9c335b authored by Konstantinos Poulakakis's avatar Konstantinos Poulakakis
Browse files

Merge branch 'develop' into feat/159-automation-component-skeleton

# Conflicts:
#	scripts/run_tests_locally-kpi-DB.sh
#	scripts/run_tests_locally-telemetry-DB.sh
#	scripts/run_tests_locally-telemetry-backend.sh
#	scripts/run_tests_locally-telemetry-frontend.sh
#	src/analytics/.gitlab-ci.yml
#	src/analytics/frontend/service/AnalyticsFrontendServiceServicerImpl.py
#	src/analytics/frontend/tests/test_frontend.py
#	src/common/tools/kafka/Variables.py
parents fa2fbda4 dab05407
No related branches found
No related tags found
2 merge requests!294Release TeraFlowSDN 4.0,!238Automation component skeleton
Showing
with 428 additions and 201 deletions
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