Merge "several enhancement/fix for kubeadm onap"
authorXuan Jia <jason.jiaxuan@gmail.com>
Tue, 7 Aug 2018 03:27:47 +0000 (03:27 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 7 Aug 2018 03:27:48 +0000 (03:27 +0000)

Trivial merge