From 69d16cfc0103cce375a4d23f46f63da1bf9114c9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 30 Dec 2017 16:57:23 +0100 Subject: u/fuel: Bump & rebase for apt-mk '2017.12' dist Change-Id: I2ab66e4c3eff1d5e1423df9201698a13cf9b345d Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch | 2 +- upstream/fuel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch index 68f3caa8..f85461f8 100644 --- a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch +++ b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch @@ -346,7 +346,7 @@ index 93ee59d..6a9be97 100644 virsh net-update "mcpcontrol" add ip-dhcp-host \ "" --live --config diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh -index ab096f3..b719aa8 100755 +index f785fc7..d53f454 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -18,6 +18,8 @@ OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv" diff --git a/upstream/fuel b/upstream/fuel index dac83c66..e3bc5ad8 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit dac83c66fa36ce532f68710a630719b6d76a4702 +Subproject commit e3bc5ad8ab4ace79f79ca3492beb76e6af8e0369 -- cgit 1.2.3-korg