tree 37fed594bffe7f4b701f0d7d70fcd213b4987dd8
parent df602801e648722c713b08f399a785cfe17161be
parent c64fd34ab58b4a7d8dacff588fe77aadec3c6743
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