From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 18 Aug 2014 22:15:14 +0000 (+0000)
Subject: Merge "Fix bash env var conditionals in merge.py call to be consistent"
X-Git-Tag: opnfv-6.0.0~2763
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1192fb70d6e0e867887b0ff8e7b16fac005ea3c2;p=apex-tripleo-heat-templates.git

Merge "Fix bash env var conditionals in merge.py call to be consistent"
---

1192fb70d6e0e867887b0ff8e7b16fac005ea3c2