From f776d862ce62f66e09a3c695b67b1905f9ecfae7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 29 Jun 2018 18:23:28 +0200 Subject: u/fuel: Bump & rebase for MaaS fabric extension Change-Id: I778c2ddde72b29fdd614cde2db5a1c0fe808dbe6 Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 ++-- upstream/fuel | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch index 23a4dcfe..951765f6 100644 --- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,10 +150,10 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index bd57ecdb..1d8a8910 100644 +index 3d9cb815..a26c9621 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -13,3 +13,5 @@ +@@ -14,3 +14,5 @@ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch diff --git a/upstream/fuel b/upstream/fuel index c0161169..93c3c3ac 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit c0161169de2a8e149818c277d19f00fe95d3b1fc +Subproject commit 93c3c3acd269016b63e72cfdda16c8652e0b2f00 -- cgit 1.2.3-korg