tree a0686edcf85500a4d58bcc162dcca916cbb9bcd4
parent a96d96372e577a8bef3ab3a9b5f9e586766b0eb0
parent 9612adce5a5d2fd9e92af5df99897aa811b00694
author Jenkins <jenkins@review.openstack.org> 1419209870 +0000
committer Gerrit Code Review <review@openstack.org> 1419209870 +0000

Merge "Fix json syntax in inline template"