Merge "Improved error handling when Energy recorder API is unavailable."
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 10 Aug 2017 09:26:46 +0000 (09:26 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 10 Aug 2017 09:26:46 +0000 (09:26 +0000)

Trivial merge