Merge "heat api management and template functions parameters"
authorMatthewLi <matthew.lijun@huawei.com>
Tue, 5 Apr 2016 03:31:23 +0000 (03:31 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 5 Apr 2016 03:31:23 +0000 (03:31 +0000)

Trivial merge