Commit 2ec0a0f9 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

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

# Conflicts:
#   example-data/nfv-nsd.xml
#   example-data/nfv-vnfd.xml
parents 70442076 a342a58a
Pipeline #1621 passed with stage
in 0 seconds