Upstream: Fuel@OPNFV: Fuel Master VM templates 45/23045/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 12 Oct 2016 19:32:05 +0000 (21:32 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 12 Oct 2016 19:50:43 +0000 (21:50 +0200)
commite49d5070a5f17c2aa52167ce157b4e3d4d6674dd
treea1a72153a1894ace0bd51606792e37ec1e8dcccb
parenta1485af5146bf13456af0f995612d2a502cd7a39
Upstream: Fuel@OPNFV: Fuel Master VM templates

While at it, also upstream:
"build: Use OPNFV_GIT_SHA for ISO preparer ID"

JIRA: ARMBAND-98
JIRA: ARMBAND-146

Conflicts:
patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch
patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch

Change-Id: Ifcd7b3041d172aa492e26477c0872cd96efd90ba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch [deleted file]
patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch [deleted file]
patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch [deleted file]
patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch