tree fa2fa0b0e5c61d4f836b2bfbda533d161e2925df
parent b5bc3301905da91230eedb2f3182ae954b13baa5
parent a213e2c3cafe0739c60766b451d0d44755e87ced
author Jenkins <jenkins@review.openstack.org> 1377885564 +0000
committer Gerrit Code Review <review@openstack.org> 1377885564 +0000

Merge "Move Heat to a single heat.conf"