From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 23 Nov 2016 15:57:20 +0000 (+0000)
Subject: Merge "Remove Combination alarms support"
X-Git-Tag: opnfv-6.0.0~1383
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=42405fae723a7e7d901ea222279efdf98d866657;p=apex-tripleo-heat-templates.git

Merge "Remove Combination alarms support"
---

42405fae723a7e7d901ea222279efdf98d866657