From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 11 Jul 2016 20:52:35 +0000 (+0000)
Subject: Merge "Combine parameter_default fields"
X-Git-Tag: opnfv-6.0.0~1861
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=81ee3b79d01f065528b0e17675aba311863c25b2;p=apex-tripleo-heat-templates.git

Merge "Combine parameter_default fields"
---

81ee3b79d01f065528b0e17675aba311863c25b2