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

Fix for Bug#97

See merge request !17

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

Bug#102

See merge request !15

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

Fix for Bug#100

See merge request !14

Fix for Bug#99

See merge request !13

Fix for Bug#95

See merge request !12

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

Bug#93

See merge request !26

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

Addressing bug#91

See merge request !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 nfv/SOL006!3