Merge "Increase ironic undercloud timouts" into stable/colorado
authorDan Radez <dradez@redhat.com>
Wed, 21 Sep 2016 14:14:55 +0000 (14:14 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 21 Sep 2016 14:14:56 +0000 (14:14 +0000)

Trivial merge