From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 16 Sep 2016 21:09:15 +0000 (+0000)
Subject: Merge "Expose parameter to enable combination alarms"
X-Git-Tag: opnfv-6.0.0~1597
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3031decbe230b9068c6af87004894bca469b1e89;p=apex-tripleo-heat-templates.git

Merge "Expose parameter to enable combination alarms"
---

3031decbe230b9068c6af87004894bca469b1e89