tree 02ddf99fa8c0e34a8bd6cb99e40c63a013699ee7
parent 6b48a235cbc3dc939f33eec775a3449969043fb0
parent 7f1a184ac9e6bcb49673a348f8044c3d9970fe3e
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