From a7c75cde58bb300c3cec79e794a7f8e9d0778eaa Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Tue, 19 May 2020 11:28:13 +0200 Subject: [PATCH] [GENERIC] Follow master branches we were following frankfurt branches by mistake. Issue-ID: OOM-2406 Signed-off-by: Sylvain Desbureaux Change-Id: Ia59d84c75cecd5cc186eb61be25cc9a371282567 --- .gitmodules | 4 ++-- kubernetes/aai | 2 +- kubernetes/robot | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index ddad6f6c9a..19cca65ede 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "kubernetes/aai"] path = kubernetes/aai url = ../aai/oom - branch = frankfurt + branch = master ignore = dirty [submodule "kubernetes/robot"] path = kubernetes/robot url = ../testsuite/oom - branch = frankfurt + branch = master ignore = dirty diff --git a/kubernetes/aai b/kubernetes/aai index d687fd0c9e..2aba1f4b1c 160000 --- a/kubernetes/aai +++ b/kubernetes/aai @@ -1 +1 @@ -Subproject commit d687fd0c9efe31e93287da11e3e390984a5fb6ce +Subproject commit 2aba1f4b1c872ddf429f4635b982b3e15ecc4aac diff --git a/kubernetes/robot b/kubernetes/robot index 1bc31c7d76..77f1d25542 160000 --- a/kubernetes/robot +++ b/kubernetes/robot @@ -1 +1 @@ -Subproject commit 1bc31c7d76408bdf2267bf72bf3b1b1e18e2367f +Subproject commit 77f1d25542848d7a5fd32f57436c9f413e0a5919 -- 2.16.6