tree ec51498b5999ec20b1cd5a740a2c473a5c1c4f01
parent faa9891d6c9e6eb98c2a3e748d77cf14f0e65a0e
parent 0b76f2f0d2da2afb4df2a9c54c8a362621373d7c
author Jenkins <jenkins@review.openstack.org> 1413306487 +0000
committer Gerrit Code Review <review@openstack.org> 1413306487 +0000

Merge "Run telemetry in javelin if resources.yaml says so"