Merge "add VNF scale-up template"
authorRoss Brattain <ross.b.brattain@intel.com>
Thu, 19 Oct 2017 00:12:16 +0000 (00:12 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 19 Oct 2017 00:12:16 +0000 (00:12 +0000)

Trivial merge