Merge "Revert "pull in heat bug fix.""
authorNarinder Gupta <narinder.gupta@canonical.com>
Thu, 21 Sep 2017 09:21:10 +0000 (09:21 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 21 Sep 2017 09:21:10 +0000 (09:21 +0000)

Trivial merge