From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Tue, 19 May 2020 21:35:23 +0000 (+0000)
Subject: Merge "Fix policy api credentials for oof in oom"
X-Git-Tag: 7.0.0~428
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d4c860c092ad5ebcff7df5f4d4e75b36ee3ad958;hp=7344c288f326851595ecd2971e91ea912a1853de;p=oom.git

Merge "Fix policy api credentials for oof in oom"
---

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