tree f3b6137a0278bc121553d71615ca78912e078581
parent ea61c9fa81f1cf81251278b16756f46b7d8118da
parent 6c453d3261e6961b4895224535545e50976c94b0
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1458793649 -0400
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1458793649 -0400

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