Merge "bugfix: compass4nfv support ceilometer"
authorshuai chen <chenshuai@huawei.com>
Fri, 25 Dec 2015 00:49:32 +0000 (00:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 25 Dec 2015 00:49:32 +0000 (00:49 +0000)

Trivial merge