tree 26983d2594ac6985018a20e51fb4806b32b3eaa9
parent 8167b255050bced47e830318fd92bda92cfdb1fa
parent 86f132709215c0792249f05170078317dd12f944
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1457132220 -0500
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1457132220 -0500

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