From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 7 Mar 2016 14:31:00 +0000 (+0000)
Subject: Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""
X-Git-Tag: opnfv-6.0.0~2129
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=582a3115f744af151f4cd36a5ad0ac3e8ef09a7f;p=apex-tripleo-heat-templates.git

Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""
---

582a3115f744af151f4cd36a5ad0ac3e8ef09a7f