From: Alexandru Avadanii Date: Tue, 22 May 2018 18:50:39 +0000 (+0200) Subject: u/fuel: Bump & rebase for generate_dhparams fix X-Git-Tag: opnfv-7.0.0~54 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f7b415771ffd76ee1100b6b056942ba8db754b1d;p=armband.git u/fuel: Bump & rebase for generate_dhparams fix Change-Id: Idd82da13949905a09158010cfd3f58912cccefe5 Signed-off-by: Alexandru Avadanii --- diff --git a/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch index 09dda594..9e62f7e1 100644 --- a/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0006-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 ce59395c..39e737d6 100644 +index 3cdc646a..a0b625bc 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,5 @@ +@@ -17,3 +17,5 @@ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.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 bd04374d..c7dff6e1 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit bd04374d931bea88476d4c3d08ac44f46febecce +Subproject commit c7dff6e1ae6444f60d3fe20b1f495609c7980051