tree ba5c66f346fd1a1c70cd236bddbc8170e04c18f0
parent 5892cdd1e7e3e187756ad12e9cba3b401f63fcf8
parent 39a074e80be40ed4ede656f17bac596a8105a7e8
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