tree 123269450521f6f1e60b51d0e5e2cb052fca57d9
parent b43c73806bca4719a7c19f82d16eaccdb45ae372
parent 6b2434eb701bfecdfe58f0f0f10205c940ef3d46
author Adam Tengler <atengler@mirantis.com> 1501673623 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> 1501673624 +0000

Merge "Update to work with new heat templates"