Merge changes I15f5d41f,I7c7125ac
authorFatih Degirmenci <fdegir@gmail.com>
Mon, 26 Feb 2018 10:34:39 +0000 (10:34 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 26 Feb 2018 10:34:39 +0000 (10:34 +0000)
commit585f3a12c5b06e97f69b11b6228fa44559ef67e9
tree1d318a81f01e6bf202597238dd1fa04f6a00dcf8
parent1cc81c151829ec519c04f3210c73f87b639341df
parentd4f1368f899ddefc0cdfa7e7d84226d3fe3615b4
Merge changes I15f5d41f,I7c7125ac

* changes:
  Export CI_LOOP as expected by Functest
  Export an new var related to Energy