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

Merge "Remove Combination alarms support"
---

7787653c89c89d14b65d1babc8f1abe8780ebedf