Merge "Deactivated test heat template's volume encryption."
authorSteven Pisarski <s.pisarski@cablelabs.com>
Fri, 1 Dec 2017 14:14:17 +0000 (14:14 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 1 Dec 2017 14:14:17 +0000 (14:14 +0000)

Trivial merge