Merge "rebase to k8s 1.12 & docker 18.06 and enable device plugin"
authorXuan Jia <jason.jiaxuan@gmail.com>
Thu, 18 Oct 2018 01:02:18 +0000 (01:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 18 Oct 2018 01:02:18 +0000 (01:02 +0000)

Trivial merge