Merge "new template skip tests"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Thu, 16 Feb 2017 16:27:55 +0000 (16:27 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Thu, 16 Feb 2017 16:27:55 +0000 (16:27 +0000)

Trivial merge