From: boucherv <valentin.boucher@orange.com>
Date: Tue, 12 Jan 2016 10:55:01 +0000 (+0000)
Subject: Merge "Add timeout for cloudify-manager deployment"
X-Git-Tag: colorado.1.0~664
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fd2d6e5b9fcfdf8cffb0aa4ea27568334cb374e8;p=functest.git

Merge "Add timeout for cloudify-manager deployment"
---

fd2d6e5b9fcfdf8cffb0aa4ea27568334cb374e8