From: Marco Platania <platania@research.att.com>
Date: Wed, 18 Oct 2017 13:49:43 +0000 (+0000)
Subject: Merge "Fix naming conflict in vLB/vDNS Heat template"
X-Git-Tag: 1.0.0-Amsterdam~101
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3d555796e00cf21ed3f1e2f878f2e5bc221980be;p=demo.git

Merge "Fix naming conflict in vLB/vDNS Heat template"
---

3d555796e00cf21ed3f1e2f878f2e5bc221980be