summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristina Pauna <cristina.pauna@enea.com>2018-04-19 14:50:09 +0300
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-22 00:23:34 +0000
commit8e052ccc117aa4fa8e38911aa2f303bd63f40ba3 (patch)
tree1a84db6527e1e1bdfa15ab65e7efa9a173885946
parentb58c6aee590cc39ce9c1b16809a52daddfb4fa0e (diff)
u/fuel: Bump & rebase for vlan parametrization
Change-Id: If8b154835b4ac18117108c6a0070a65f6db3e011 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com> (cherry picked from commit 5491081be01a3ec9cedc5a8f57a07510ef951a3f)
-rw-r--r--patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch2
m---------upstream/fuel0
2 files changed, 1 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
index 66aff1c0..c3ffa52a 100644
--- a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
+++ b/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
@@ -23,7 +23,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
-index 35dab9b9..5ad45364 100644
+index 79a5fa04..8a5fbb91 100644
--- a/mcp/config/labs/local/idf-virtual1.yaml
+++ b/mcp/config/labs/local/idf-virtual1.yaml
@@ -42,10 +42,10 @@ idf:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 67b7248e3cc8550ebd757ebb48e2536770f073f
+Subproject aa199b5e96f91111d96f53040be00736cd9309b