Commit f433737c authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Merge branch 'v2.7.1' into 'bug#244'

# Conflicts:
#   example-data/nfv-nsd.xml
#   src/yang/etsi-nfv-ns.yang
parents 0463e048 5e261d31
Pipeline #1287 passed with stage
in 0 seconds