Merge "deploy: Attempt fixing random deploy timeouts" into stable/colorado
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 6 Sep 2016 19:17:46 +0000 (19:17 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 6 Sep 2016 19:17:46 +0000 (19:17 +0000)

Trivial merge