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)
commit47dab344fe4a76b92a81529117d6a2248e3df0bc
tree33ca0854fb5255321388b493763e448147ab4a96
parent245f827f4a06cbf2e5a760ae707196878f9e7f3d
parent8b78537a7e24263af4760fd6fe10737099e0f988
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