Merge "set 'trusts' auth model in heat"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Thu, 16 Mar 2017 07:35:42 +0000 (07:35 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 16 Mar 2017 07:35:42 +0000 (07:35 +0000)

Trivial merge