# Conflicts:
#   src/yang/etsi-nfv-common.yang
#   src/yang/etsi-nfv-ns.yang
#   src/yang/etsi-nfv-vnf.yang

Bug#93

See merge request nfv/SOL006!26

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang

Addressing bug#91

See merge request nfv/SOL006!24

Bug#90 - VduCpd should point to VnfVirtualLinkDesc and Vnfd ExtCpd should be a choice

See merge request !5

Changes to collapse into a singe namespace (bug#88)

See merge request !4

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang

Proposed fix for bug 87

See merge request !3

PR1

See merge request nfv/SOL006!1

  - patch set 2 fixes exit code of script
  - patch set 3 adds img version and renames output

Change-Id: I8d01d96a44cad9eb038c8b76f008611e929c4006