From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 27 Apr 2017 20:20:53 +0000 (+0000)
Subject: Merge "Prepare 6.1.0 (ocata)" into stable/ocata
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0b8fa1c7fecf0a95029a25a1e38218e55f085db6;p=apex-tripleo-heat-templates.git

Merge "Prepare 6.1.0 (ocata)" into stable/ocata
---

0b8fa1c7fecf0a95029a25a1e38218e55f085db6