Skip to content
Snippets Groups Projects
Commit 1ca95b17 authored by Javier Moreno's avatar Javier Moreno
Browse files

Merge branch 'develop' into feat/monitoring-subscriptions

# Conflicts:
#	deploy.sh
#	manifests/monitoringservice.yaml
#	manifests/webuiservice.yaml
#	src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java
#	src/automation/target/kubernetes/kubernetes.yml
#	src/common/DeviceTypes.py
#	src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
#	src/device/service/drivers/__init__.py
#	src/slice/service/SliceServiceServicerImpl.py
#	src/tests/ofc22/run_test_01_bootstrap.sh
#	src/webui/service/static/topology_icons/Acknowledgements.txt
#	tutorial/2-2-ofc22.md
parents 99fbab45 61eff2eb
No related branches found
No related tags found
Loading
Showing
with 989 additions and 251 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