Merge branch 'master' into 'bug#89'
# Conflicts: # example-data/nfv.xml # src/yang/etsi-nfv-common.yang # src/yang/etsi-nfv-ns.yang # src/yang/etsi-nfv-vnf.yang
WARNING! GitLab maintenance operation scheduled for today between 12:00 and 14:00 (CET). During this time window, GitLab will be unavailable, and any data entered during this period may be lost. Thank you in advance for your understanding.
# Conflicts: # example-data/nfv.xml # src/yang/etsi-nfv-common.yang # src/yang/etsi-nfv-ns.yang # src/yang/etsi-nfv-vnf.yang