From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 6 Apr 2017 23:54:05 +0000 (+0000)
Subject: Merge "Updated from global requirements" into stable/ocata
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f4c9d2abafcc0ce34f786b3c12884b648d90e6a8;p=apex-tripleo-heat-templates.git

Merge "Updated from global requirements" into stable/ocata
---

f4c9d2abafcc0ce34f786b3c12884b648d90e6a8