Merge "conductor module in server part of testing-scheduler."
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
Tue, 4 Sep 2018 10:52:37 +0000 (10:52 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 4 Sep 2018 10:52:37 +0000 (10:52 +0000)

Trivial merge