Merge "heat template update with tls option"
authorGary Wu <gary.i.wu@huawei.com>
Mon, 8 Oct 2018 16:56:14 +0000 (16:56 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 8 Oct 2018 16:56:14 +0000 (16:56 +0000)

Trivial merge