From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 1 Mar 2017 03:56:03 +0000 (+0000)
Subject: Merge "upgrades: fix ec2api conditional"
X-Git-Tag: opnfv-6.0.0~985
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=236a27a1ff2916ee353182eb590f0a33f7de70ee;p=apex-tripleo-heat-templates.git

Merge "upgrades: fix ec2api conditional"
---

236a27a1ff2916ee353182eb590f0a33f7de70ee