Code Review / yardstick.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: d491d77) | patch
Fix the conflict in yardstick.conf between API and CI 31/24831/2
authorchenjiankun <chenjiankun1@huawei.com>
Thu, 24 Nov 2016 07:07:07 +0000 (07:07 +0000)
committerJack Chan <chenjiankun1@huawei.com>
Thu, 24 Nov 2016 07:21:52 +0000 (07:21 +0000)
commit450c047a8812d3d9e772f26a2faeb17acef3e90a
tree9a0e3aab8a2910a37ef6d78aef92c2e1a5f850c3tree | snapshot
parentd491d77dea52e459dc6f1e1ec39703e26a4857e7commit | diff
Fix the conflict in yardstick.conf between API and CI

JIRA: YARDSTICK-421

In the Docker image, the default dispatcher value in yardstick.conf is local influxDB.
But the CI will set another.
It will cause a conflict.
So I '>' to cover yardstick.conf file.

Change-Id: I7088682e952ee7bb84f6872a49a24296d676a9cb
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
api/api-prepare.sh diff | blob | history
tests/ci/yardstick-verify diff | blob | history