Merge "[compass4nfv] merge the docker image compass-tasks-k8s and compass-tasks-osa...
authormei mei <meimei@huawei.com>
Thu, 28 Dec 2017 01:18:49 +0000 (01:18 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 28 Dec 2017 01:18:49 +0000 (01:18 +0000)

Trivial merge