summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
m---------kubernetes/aai0
m---------kubernetes/robot0
3 files changed, 2 insertions, 2 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
-Subproject d687fd0c9efe31e93287da11e3e390984a5fb6c
+Subproject 2aba1f4b1c872ddf429f4635b982b3e15ecc4aa
diff --git a/kubernetes/robot b/kubernetes/robot
-Subproject 1bc31c7d76408bdf2267bf72bf3b1b1e18e2367
+Subproject 77f1d25542848d7a5fd32f57436c9f413e0a591