From: Markos Chandras <mchandras@suse.de>
Date: Fri, 10 Mar 2017 10:18:02 +0000 (+0000)
Subject: Merge changes from topic 'prototypes/bifrost/scripts/use-json-inventory'
X-Git-Tag: danube.1.0~160
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47dab344fe4a76b92a81529117d6a2248e3df0bc;p=releng.git

Merge changes from topic 'prototypes/bifrost/scripts/use-json-inventory'

* changes:
  prototypes: bifrost: Fix ELEMENTS_PATH for latest diskimage-builder release
  prototypes: bifrost: Switch to JSON for inventory
---

47dab344fe4a76b92a81529117d6a2248e3df0bc