From: QiLiang <liangqi1@huawei.com>
Date: Thu, 15 Oct 2015 01:38:55 +0000 (+0000)
Subject: Merge "Support general configuration file"
X-Git-Tag: brahmaputra.1.0~172
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=15e8300a8e85d5907c5ea90da505929b8ca85ca0;p=yardstick.git

Merge "Support general configuration file"
---

15e8300a8e85d5907c5ea90da505929b8ca85ca0