From 3b291dc48f526df8fc85c3a54a6a4bc9f0094f38 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 13 Jul 2017 00:21:03 +0200 Subject: [PATCH] Update git submodules * Update docs/submodules/armband from branch 'master' - p/fuel: Rebase, drop --depth=1 when cloning Fuel `git clone --depth=1` does not preserve git history, so 3-way merge is not possible. There are 2 ways to fix this: - (recurrent) rebase patches by adjusting patch context; - (one-time, with a recurrent very small performance hit) preserve git history when cloning Fuel@OPNFV in salt.sh; So, let's drop "--depth=1" and ensure `git am -3` will continue to work on future patch context changes (where possbile). While we're at it, also rebase our current patches. Change-Id: Iacfb4daf90a170174405410ff9c988c4fcac79ca Signed-off-by: Alexandru Avadanii --- docs/submodules/armband | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/submodules/armband b/docs/submodules/armband index de0b0f160..a38deb88e 160000 --- a/docs/submodules/armband +++ b/docs/submodules/armband @@ -1 +1 @@ -Subproject commit de0b0f160f6ac408c2ba302507ede4d0a537b73f +Subproject commit a38deb88ed5fc0dc7e94404ef522898cb5741fb6 -- 2.16.6