Rebase on upstream update

(cherry picked from commit 7812485e01f40a824a0820d73beb1a0a96599eb6)

Change-Id: I1d31667ca5151f2af0acb555b4de9c5dc7f99b2e

diff --git a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
index 28e6384..4ce6d83 100644 (file)
--- a/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
+++ b/patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch
@@ -7,15 +7,15 @@ Subject: [PATCH] Allow customizing fuel-plugin-qemu
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
-index 1f823b6..d19b788 100644
+index 0b84654..e7fb65a 100644
 --- a/build/f_isoroot/f_qemupluginbuild/config.mk
 +++ b/build/f_isoroot/f_qemupluginbuild/config.mk
 @@ -7,6 +7,6 @@
  # http://www.apache.org/licenses/LICENSE-2.0
  ##############################################################################
  
--QEMU_BRANCH=fc2f266fc0986b56deb0b740a5e202205b577a60
+-QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
 -QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
-+QEMU_BRANCH:=fc2f266fc0986b56deb0b740a5e202205b577a60
++QEMU_BRANCH:=c35ce3377bcf382a4e36f1df49758100cd2910b1
 +QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
  QEMU_CHANGE=