Merge "Bug fix for aodh database and conf file"
authorshuai chen <chenshuai@huawei.com>
Wed, 3 Aug 2016 08:09:58 +0000 (08:09 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Aug 2016 08:09:58 +0000 (08:09 +0000)

Trivial merge