Merge changes from topic 'prototypes/bifrost/scripts/use-json-inventory'
authorMarkos Chandras <mchandras@suse.de>
Fri, 10 Mar 2017 10:18:02 +0000 (10:18 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 10 Mar 2017 10:18:02 +0000 (10:18 +0000)
* changes:
  prototypes: bifrost: Fix ELEMENTS_PATH for latest diskimage-builder release
  prototypes: bifrost: Switch to JSON for inventory


Trivial merge