Merge "change the timeout to 4 hours"
authorJun Li <matthew.lijun@huawei.com>
Tue, 20 Jun 2017 06:32:52 +0000 (06:32 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 20 Jun 2017 06:32:52 +0000 (06:32 +0000)

Trivial merge