From: shuai chen <chenshuai@huawei.com>
Date: Wed, 25 May 2016 00:45:41 +0000 (+0000)
Subject: Merge "Update for Aodh"
X-Git-Tag: colorado.1.0~125
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=12d4586098effd082bc3f927c1a41cbc85301285;p=compass4nfv.git

Merge "Update for Aodh"
---

12d4586098effd082bc3f927c1a41cbc85301285