[GENERIC] Follow master branches

we were following frankfurt branches by mistake.

Issue-ID: OOM-2406
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ia59d84c75cecd5cc186eb61be25cc9a371282567

diff --git a/.gitmodules b/.gitmodules
index ddad6f6..19cca65 100644 (file)
--- 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 d687fd0..2aba1f4 160000 (submodule)
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit d687fd0c9efe31e93287da11e3e390984a5fb6ce
+Subproject commit 2aba1f4b1c872ddf429f4635b982b3e15ecc4aac

diff --git a/kubernetes/robot b/kubernetes/robot
index 1bc31c7..77f1d25 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 1bc31c7d76408bdf2267bf72bf3b1b1e18e2367f
+Subproject commit 77f1d25542848d7a5fd32f57436c9f413e0a5919