Merge "Add constraints and timeouts from file in single step"
authorJenkins <jenkins@review.openstack.org>
Mon, 23 Nov 2015 12:47:37 +0000 (12:47 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 23 Nov 2015 12:47:37 +0000 (12:47 +0000)

Trivial merge