Merge changes Iddfdf664,Ifd7f98a4
authorhoban <adrian.hoban@intel.com>
Fri, 2 Mar 2018 14:37:58 +0000 (15:37 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Fri, 2 Mar 2018 14:37:58 +0000 (15:37 +0100)
* changes:
  Generalize member-vnf-index as string in constituent-vnfd in NSD to allow symbolic names
  Feature 639: support of floating IPs


Trivial merge