From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 23 Nov 2015 12:47:37 +0000 (+0000)
Subject: Merge "Add constraints and timeouts from file in single step"
X-Git-Tag: opnfv-6.0.0~2293
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=705a6401a6db2fe9f78ee5f6584026179e64c7ae;p=apex-tripleo-heat-templates.git

Merge "Add constraints and timeouts from file in single step"
---

705a6401a6db2fe9f78ee5f6584026179e64c7ae