Merge "Re-enable the ceilometer alarm test"
tree: 56396a7028aa9025d66b6f9365e4a2c1b56bcf2e
  1. common/
  2. functional/
  3. scenario/