Merge "Fix naming conflict in vLB/vDNS Heat template"
authorMarco Platania <platania@research.att.com>
Wed, 18 Oct 2017 13:49:43 +0000 (13:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 18 Oct 2017 13:49:43 +0000 (13:49 +0000)

Trivial merge