tree d78868473a865fcab8ecb1116a4fdb12a810e1b6
parent bbfe0d2372f958984130084bf0b121560da940b9
parent abea28868cd1f3cea7895f03d2840886f94634bc
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