Merge "Sync docker manifest with heat template versions"
authorMarco Platania <platania@research.att.com>
Tue, 1 May 2018 16:02:51 +0000 (16:02 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 1 May 2018 16:02:51 +0000 (16:02 +0000)

Trivial merge