Merge "Add "resources" parameter in Kubernetes context"
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Tue, 10 Jul 2018 09:23:29 +0000 (09:23 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 10 Jul 2018 09:23:29 +0000 (09:23 +0000)

Trivial merge