diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-04-05 12:33:16 +0200 |
|---|---|---|
| committer | Stanislaw Kardach <kda@semihalf.com> | 2016-04-05 12:33:16 +0200 |
| commit | 4d4bf7c29530ea85570b30ee9b351bc55825b950 (patch) | |
| tree | 9cbdd36473337263b7f0fafaba2f74879c4967aa /patches/opnfv-fuel | |
| parent | 99f2db2813e2fc16464a2a9493307e9279f4d7f5 (diff) | |
Rebase after upstream bump
Diffstat (limited to 'patches/opnfv-fuel')
3 files changed, 5 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch index d30a954c..9ee8ead5 100644 --- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch +++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Allow customizing Fuel commit 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/config.mk b/build/config.mk -index e11d033..2a81027 100644 +index 667575c..30d9ccc 100644 --- a/build/config.mk +++ b/build/config.mk @@ -9,7 +9,7 @@ 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 3c7b1f35..28e6384d 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 e9c4356..c23e9c2 100644 +index 1f823b6..d19b788 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=1eb8bf930e2ec6e64526e95fcb21124f7401a243 +-QEMU_BRANCH=fc2f266fc0986b56deb0b740a5e202205b577a60 -QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu -+QEMU_BRANCH:=1eb8bf930e2ec6e64526e95fcb21124f7401a243 ++QEMU_BRANCH:=fc2f266fc0986b56deb0b740a5e202205b577a60 +QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu QEMU_CHANGE= diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch index dd043892..61ba7e3c 100644 --- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch +++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-opendaylight.patch @@ -8,7 +8,7 @@ Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile -index b0bc9c7..cc305e0 100644 +index 3ecf680..b0449d0 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -8,8 +8,8 @@ |