Merge "integration test: adjusts timeout"
tree: 853ec945b38559444b6a0caccf21d8191eb43c30
  1. ceilometer/