Skip to content
Commit 2ec0a0f9 authored by jethanandani's avatar jethanandani
Browse files

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

# Conflicts:
#   example-data/nfv-nsd.xml
#   example-data/nfv-vnfd.xml
parents 70442076 a342a58a