tree 912feac186dd7dee9e6004661cc1d60ccb76b6b2
parent 09f55013849ac71c3d21b5c85498aad48ff46429
parent ef6b731cf92c5b4a91a6272739b77975a24a932b
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1455518326 -0500
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1455518326 -0500

Merge branch 'ceilometer_devstack' of https://github.com/open-cloud/xos into ceilometer_devstack