aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-26 18:14:22 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-26 18:15:13 +0100
commit8443c7861cf5a522b229a3610cf93ed9bc6ac1ec (patch)
tree323dcac300133e78f27c2106669d78ffdf63e437
parent9ae9224167df484e79da620680b95fcfa349d644 (diff)
u/fuel: Bump & rebase for cmp proto dhcp on PXE
Change-Id: Ib9e8cc0687fad72d1376fc9e651d5c67beb7863d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 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 997c18d..7ceb0a1 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 <Alexandru.Avadanii@enea.com>
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
-Subproject c24aa2e8919bc13f14236677503983075e35f56
+Subproject 48055f477ec91491bce13230b652939f1941dbb