Merge "Update for Aodh"
authorshuai chen <chenshuai@huawei.com>
Wed, 25 May 2016 00:45:41 +0000 (00:45 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 25 May 2016 00:45:41 +0000 (00:45 +0000)
commit12d4586098effd082bc3f927c1a41cbc85301285
tree24b227c1fdc9adbef38aa5c5920880bacd39bb6e
parentd145e106f192df2772a3c73f661243530c1f5bf3
parentb30e8e6b040efc7ad78b020277a9b93930f2f5a6
Merge "Update for Aodh"