Merge "bugfix: tc038 ssh default wait 3600s"
authorKubi <jean.gaoliang@huawei.com>
Fri, 11 Aug 2017 07:55:43 +0000 (07:55 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 11 Aug 2017 07:55:43 +0000 (07:55 +0000)

Trivial merge