Merge "Energy monitoring SDK update."
authorJose Lausuch <jose.lausuch@ericsson.com>
Mon, 3 Jul 2017 14:13:24 +0000 (14:13 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 3 Jul 2017 14:13:24 +0000 (14:13 +0000)

Trivial merge