Merge "rewrite _generate_pod_yaml to combine name and pkey setting"
authorRoss Brattain <ross.b.brattain@intel.com>
Thu, 5 Oct 2017 15:51:32 +0000 (15:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 5 Oct 2017 15:51:32 +0000 (15:51 +0000)

Trivial merge