From daf95f3b779db56222be35e04610bac83a53575a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 4 Jan 2018 23:56:50 +0100 Subject: u/fuel: Bump & rebase for nbd module build Change-Id: Iff82769f7f5e867baa54c0ceece765be207df17f Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 2 +- upstream/fuel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 724cafc1..dac4ff3a 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -75,7 +75,7 @@ index 284f1bc..533500d 100644 /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml -index 7a37fe7..3de9d49 100644 +index 04ffdb4..9cad061 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml @@ -39,6 +39,42 @@ parameters: diff --git a/upstream/fuel b/upstream/fuel index 6e0e518d..84f58189 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 6e0e518d43cecfb8f981dbd51326d8eae103720c +Subproject commit 84f58189f269be6633e0c8897d5624d3dfaaa650 -- cgit 1.2.3-korg