tree 1dca31358006634da8439b67ab928f6e32d754b5
parent f31e4d46a710a5832efa6aba788184daea78d304
parent f9ca33e0c4b3744d3f84aeb6d010e0243dff5ca3
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1456596626 -0500
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1456596626 -0500

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