From: hoban <adrian.hoban@intel.com>
Date: Fri, 2 Mar 2018 14:37:58 +0000 (+0100)
Subject: Merge changes Iddfdf664,Ifd7f98a4
X-Git-Tag: v3.1.0~8
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b869fa14a97777a70130db6eaf37e06c5b8fff14;p=osm%2FIM.git

Merge changes Iddfdf664,Ifd7f98a4

* changes:
  Generalize member-vnf-index as string in constituent-vnfd in NSD to allow symbolic names
  Feature 639: support of floating IPs
---

b869fa14a97777a70130db6eaf37e06c5b8fff14