tree 366fd69e415f1b8181d101b55a49cbc7a9c07346
parent 434fac566b3880fe0a9001238411c50bb12d7f3e
parent 1b0eccdf75cf70a26c1b2ae6b9beaa75ebaf7a6a
author Jenkins <jenkins@review.openstack.org> 1389638394 +0000
committer Gerrit Code Review <review@openstack.org> 1389638394 +0000

Merge "Fix Heat/Cloud formation catalog template"