Merge "add VNF scale-up template" into stable/euphrates
authorRoss Brattain <ross.b.brattain@intel.com>
Thu, 19 Oct 2017 02:58:42 +0000 (02:58 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 19 Oct 2017 02:58:42 +0000 (02:58 +0000)

Trivial merge