Merge "Add aodh default credentials"
authorshuai chen <chenshuai@huawei.com>
Tue, 7 Jun 2016 00:58:02 +0000 (00:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 7 Jun 2016 00:58:02 +0000 (00:58 +0000)

Trivial merge