Merge "HAproxy/heat_api: increase timeout to 10m"
authorJenkins <jenkins@review.openstack.org>
Tue, 18 Apr 2017 06:58:02 +0000 (06:58 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 18 Apr 2017 06:58:02 +0000 (06:58 +0000)

Trivial merge