From 6a35ee2149e74b850120f7fcfec666448ad40fbd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 29 Aug 2017 01:13:21 +0200 Subject: p/fuel: Rebase for seedng Salt version fix Change-Id: I4beacbb8f64da80e7a8a374cc4db3d470edf79cd Signed-off-by: Alexandru Avadanii --- .../0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch') diff --git a/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 985dd65d..2d701937 100644 --- a/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -94,11 +94,11 @@ index 0000000..b969e07 ++{{endif}} ++{% endraw %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 419ff26..dbc72db 100644 +index f65daab..ed2dd4e 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -6,3 +6,4 @@ - /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch +@@ -7,3 +7,4 @@ /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch + /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch -- cgit 1.2.3-korg