Merge "Add jjob Functest timeout as input parameter, default 210"
authorjose.lausuch <jose.lausuch@ericsson.com>
Mon, 15 Feb 2016 18:06:31 +0000 (18:06 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 15 Feb 2016 18:06:31 +0000 (18:06 +0000)

Trivial merge