Merge "Fixes heat-engine failures"
authorTim Rozet <trozet@redhat.com>
Tue, 16 Aug 2016 02:54:55 +0000 (02:54 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 16 Aug 2016 02:54:55 +0000 (02:54 +0000)

Trivial merge