Merge "Add timeout for cloudify-manager deployment"
authorboucherv <valentin.boucher@orange.com>
Tue, 12 Jan 2016 10:55:01 +0000 (10:55 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 10:55:01 +0000 (10:55 +0000)

Trivial merge