Code Review / armband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b58c6ae)
u/fuel: Bump & rebase for vlan parametrization 03/56203/1
authorCristina Pauna <cristina.pauna@enea.com>
Thu, 19 Apr 2018 11:50:09 +0000 (14:50 +0300)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 22 Apr 2018 00:23:34 +0000 (00:23 +0000)
Change-Id: If8b154835b4ac18117108c6a0070a65f6db3e011
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit 5491081be01a3ec9cedc5a8f57a07510ef951a3f)

patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch patch | blob | history
upstream/fuel patch | blob | history

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 66aff1c..c3ffa52 100644 (file)
--- 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
index 67b7248..aa199b5 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 67b7248e3cc8550ebd757ebb48e2536770f073f8
+Subproject commit aa199b5e96f91111d96f53040be00736cd9309be