summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-04-11 12:39:48 +0200
committerStanislaw Kardach <kda@semihalf.com>2016-04-11 12:39:48 +0200
commit7812485e01f40a824a0820d73beb1a0a96599eb6 (patch)
treeaae8fed8424ea05da07d773cc029bfeff2783636 /patches/opnfv-fuel
parent5df4b8c3d088324045da0696f3b76a38614e5ef6 (diff)
Rebase on upstream update
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0006-Allow-customizing-fuel-plugin-qemu.patch6
1 files changed, 3 insertions, 3 deletions
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 28e6384d..4ce6d83e 100644
--- 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=