tree 5a3b8f9e7fbfe30fe8f7f06d22c9f2d9216585bc
parent 55c30f2175200f445a3adceb4c873fad91a7eb1a
parent adad6680d9faf2868f1ef9f645148b51fe7e36c5
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