From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 5 Apr 2016 03:31:23 +0000 (+0000)
Subject: Merge "heat api management and template functions parameters"
X-Git-Tag: colorado.1.0~77
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=bottlenecks.git;a=commitdiff_plain;h=c3756b0ed4a52407f5da611fa92ddc68b9e6be8b

Merge "heat api management and template functions parameters"
---

c3756b0ed4a52407f5da611fa92ddc68b9e6be8b