Merge "change m1.* flavor to "yardstick-flavor""
authorRex Lee <limingjiang@huawei.com>
Tue, 20 Dec 2016 01:28:57 +0000 (01:28 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 20 Dec 2016 01:28:57 +0000 (01:28 +0000)

Trivial merge