Merge "integrate daisy with yardstick"
authorJose Lausuch <jalausuch@suse.com>
Fri, 12 Jan 2018 12:42:09 +0000 (12:42 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 12 Jan 2018 12:42:09 +0000 (12:42 +0000)

Trivial merge