tree 332ecc52c62569cb477f8855d33b195566f42fdf
parent c675632f01978bc975523c3c37eaa9225dd599d0
parent 5f29edc1321b7ec215912e741742af8fd6f429d2
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1457154975 -0500
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1457154975 -0500

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