Merge "End deployment when timeout"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 3 Mar 2017 09:03:20 +0000 (09:03 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 3 Mar 2017 09:03:20 +0000 (09:03 +0000)

Trivial merge