From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 26 Aug 2016 18:01:00 +0000 (+0000)
Subject: Merge "Expose enable_combination_alarm setting"
X-Git-Tag: opnfv-6.0.0~620
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e92234e5a99a4a58eae59d94f9026b8321f2407d;p=apex-puppet-tripleo.git

Merge "Expose enable_combination_alarm setting"
---

e92234e5a99a4a58eae59d94f9026b8321f2407d