From 8443c7861cf5a522b229a3610cf93ed9bc6ac1ec Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 26 Jan 2018 18:14:22 +0100 Subject: u/fuel: Bump & rebase for cmp proto dhcp on PXE Change-Id: Ib9e8cc0687fad72d1376fc9e651d5c67beb7863d Signed-off-by: Alexandru Avadanii --- .../0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch | 4 ++-- upstream/fuel | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch index 997c18d6..7ceb0a1b 100644 --- a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch @@ -33,10 +33,10 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 5 insertions(+) diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls -index 1f04750..45aed3d 100644 +index f953cdd..f966208 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls -@@ -85,4 +85,9 @@ opendaylight: +@@ -91,4 +91,9 @@ opendaylight: - service: opendaylight {%- endif %} diff --git a/upstream/fuel b/upstream/fuel index c24aa2e8..48055f47 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit c24aa2e8919bc13f14236677503983075e35f562 +Subproject commit 48055f477ec91491bce13230b652939f1941dbb9 -- cgit 1.2.3-korg